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/utility/AppPath.h

@@ -1,7 +1,7 @@
 #ifndef APP_PATH_H
 #define APP_PATH_H
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class AppPath
 {

src/lib/utility/ConfigManager.cpp

@@ -1,14 +1,14 @@
-#include "utility/ConfigManager.h"
+#include "ConfigManager.h"
 
 #include <set>
 
-#include "tinyxml/tinyxml.h"
+#include "tinyxml.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
-#include "utility/text/TextAccess.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
+#include "FilePath.h"
+#include "logging.h"
+#include "TextAccess.h"
+#include "utility.h"
+#include "utilityString.h"
 
 std::shared_ptr<ConfigManager> ConfigManager::createEmpty()
 {

src/lib/utility/ResourcePaths.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class ResourcePaths
 {

src/lib/utility/ScopedFunctor.cpp

@@ -1,4 +1,4 @@
-#include "utility/ScopedFunctor.h"
+#include "ScopedFunctor.h"
 
 ScopedFunctor::ScopedFunctor()
 	: m_onDestroy([](){})

src/lib/utility/TimeStamp.h

@@ -1,7 +1,7 @@
 #ifndef TIME_STAMP_H
 #define TIME_STAMP_H
 
-#include "boost/date_time/posix_time/posix_time.hpp"
+#include <boost/date_time/posix_time/posix_time.hpp>
 
 class TimeStamp
 {

src/lib/utility/UserPaths.cpp

@@ -1,4 +1,4 @@
-#include "utility/UserPaths.h"
+#include "UserPaths.h"
 
 FilePath UserPaths::s_userDataPath;
 

src/lib/utility/UserPaths.h

@@ -3,7 +3,7 @@
 
 #include <string>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class UserPaths
 {

src/lib/utility/commandline/CommandLineParser.cpp

@@ -1,17 +1,17 @@
-#include "utility/commandline/CommandLineParser.h"
+#include "CommandLineParser.h"
 
 #include <iostream>
 #include <utility>
 
-#include "boost/program_options.hpp"
+#include <boost/program_options.hpp>
 
-#include "utility/commandline/CommandlineHelper.h"
-#include "utility/commandline/commands/CommandlineCommandAcceptEULA.h"
-#include "utility/commandline/commands/CommandlineCommandConfig.h"
-#include "utility/commandline/commands/CommandlineCommandIndex.h"
-#include "utility/ConfigManager.h"
-#include "utility/text/TextAccess.h"
-#include "utility/utilityString.h"
+#include "CommandlineHelper.h"
+#include "CommandlineCommandAcceptEULA.h"
+#include "CommandlineCommandConfig.h"
+#include "CommandlineCommandIndex.h"
+#include "ConfigManager.h"
+#include "TextAccess.h"
+#include "utilityString.h"
 
 namespace po = boost::program_options;
 

src/lib/utility/commandline/CommandLineParser.h

@@ -5,10 +5,10 @@
 #include <string>
 #include <vector>
 
-#include "boost/program_options.hpp"
+#include <boost/program_options.hpp>
 
-#include "project/RefreshInfo.h"
-#include "utility/file/FilePath.h"
+#include "RefreshInfo.h"
+#include "FilePath.h"
 
 namespace po = boost::program_options;
 

src/lib/utility/commandline/CommandlineHelper.cpp

@@ -1,10 +1,10 @@
-#include "utility/commandline/CommandlineHelper.h"
+#include "CommandlineHelper.h"
 
 #include <fstream>
 #include <iostream>
 #include <string>
 
-#include "boost/program_options.hpp"
+#include <boost/program_options.hpp>
 
 namespace commandline {
 

src/lib/utility/commandline/CommandlineHelper.h

@@ -4,8 +4,8 @@
 #include <string>
 #include <vector>
 
-#include "utility/utilityString.h"
-#include "utility/utility.h"
+#include "utilityString.h"
+#include "utility.h"
 
 namespace boost {
 namespace program_options {

src/lib/utility/commandline/commands/CommandlineCommand.cpp

@@ -1,4 +1,4 @@
-#include "utility/commandline/commands/CommandlineCommand.h"
+#include "CommandlineCommand.h"
 
 #include <iostream>
 

src/lib/utility/commandline/commands/CommandlineCommand.h

@@ -3,7 +3,7 @@
 
 #include <memory>
 
-#include "boost/program_options.hpp"
+#include <boost/program_options.hpp>
 
 namespace po = boost::program_options;
 

src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.cpp

@@ -1,7 +1,7 @@
-#include "utility/commandline/commands/CommandlineCommandAcceptEULA.h"
+#include "CommandlineCommandAcceptEULA.h"
 
-#include "utility/commandline/CommandlineHelper.h"
-#include "utility/commandline/CommandLineParser.h"
+#include "CommandlineHelper.h"
+#include "CommandLineParser.h"
 
 namespace commandline
 {

src/lib/utility/commandline/commands/CommandlineCommandAcceptEULA.h

@@ -1,7 +1,7 @@
 #ifndef COMMANDLINE_COMMAND_ACCEPT_EULA_H
 #define COMMANDLINE_COMMAND_ACCEPT_EULA_H
 
-#include "utility/commandline/commands/CommandlineCommand.h"
+#include "CommandlineCommand.h"
 
 class CommandLineParser;
 

src/lib/utility/commandline/commands/CommandlineCommandConfig.cpp

@@ -1,13 +1,13 @@
-#include "utility/commandline/commands/CommandlineCommandConfig.h"
+#include "CommandlineCommandConfig.h"
 
 #include <functional>
 #include <utility>
 
-#include "utility/commandline/CommandlineHelper.h"
-#include "utility/commandline/CommandLineParser.h"
-#include "utility/file/FilePath.h"
+#include "CommandlineHelper.h"
+#include "CommandLineParser.h"
+#include "FilePath.h"
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 namespace commandline {
 

src/lib/utility/commandline/commands/CommandlineCommandConfig.h

@@ -1,7 +1,7 @@
 #ifndef COMMANDLINE_COMMAND_CONFIG_H
 #define COMMANDLINE_COMMAND_CONFIG_H
 
-#include "utility/commandline/commands/CommandlineCommand.h"
+#include "CommandlineCommand.h"
 
 namespace commandline
 {

src/lib/utility/commandline/commands/CommandlineCommandIndex.cpp

@@ -1,7 +1,7 @@
-#include "utility/commandline/commands/CommandlineCommandIndex.h"
+#include "CommandlineCommandIndex.h"
 
-#include "utility/commandline/CommandlineHelper.h"
-#include "utility/commandline/CommandLineParser.h"
+#include "CommandlineHelper.h"
+#include "CommandLineParser.h"
 
 namespace po = boost::program_options;
 

src/lib/utility/commandline/commands/CommandlineCommandIndex.h

@@ -1,7 +1,7 @@
 #ifndef COMMANDLINE_COMMAND_INDEX_H
 #define COMMANDLINE_COMMAND_INDEX_H
 
-#include "utility/commandline/commands/CommandlineCommand.h"
+#include "CommandlineCommand.h"
 
 namespace commandline {
 

src/lib/utility/file/FileInfo.h

@@ -3,10 +3,10 @@
 
 #include <string>
 
-#include "boost/date_time.hpp"
+#include <boost/date_time.hpp>
 
-#include "utility/file/FilePath.h"
-#include "utility/TimeStamp.h"
+#include "FilePath.h"
+#include "TimeStamp.h"
 
 struct FileInfo
 {

src/lib/utility/file/FileManager.cpp

@@ -1,10 +1,10 @@
-#include "utility/file/FileManager.h"
+#include "FileManager.h"
 
 #include <set>
 
-#include "utility/file/FileSystem.h"
-#include "utility/file/FilePath.h"
-#include "utility/file/FilePathFilter.h"
+#include "FileSystem.h"
+#include "FilePath.h"
+#include "FilePathFilter.h"
 
 FileManager::FileManager()
 {

src/lib/utility/file/FilePath.cpp

@@ -1,12 +1,12 @@
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 #include <regex>
 
-#include "boost/filesystem/path.hpp"
-#include "boost/filesystem.hpp"
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem.hpp>
 
-#include "utility/logging/logging.h"
-#include "utility/utilityString.h"
+#include "logging.h"
+#include "utilityString.h"
 
 FilePath::FilePath()
 	: m_path(std::make_unique<boost::filesystem::path>(""))

src/lib/utility/file/FilePathFilter.cpp

@@ -1,4 +1,4 @@
-#include "utility/file/FilePathFilter.h"
+#include "FilePathFilter.h"
 
 FilePathFilter::FilePathFilter(const std::wstring& filterString)
 	: m_filterString(filterString)

src/lib/utility/file/FilePathFilter.h

@@ -4,7 +4,7 @@
 #include <regex>
 #include <string>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class FilePathFilter
 {

src/lib/utility/file/FileRegister.cpp

@@ -1,7 +1,7 @@
-#include "utility/file/FileRegister.h"
+#include "FileRegister.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/file/FilePathFilter.h"
+#include "FilePath.h"
+#include "FilePathFilter.h"
 
 FileRegister::FileRegister(
 	const FilePath& currentPath,

src/lib/utility/file/FileRegister.h

@@ -3,8 +3,8 @@
 
 #include <set>
 
-#include "utility/file/FilePath.h"
-#include "utility/UnorderedCache.h"
+#include "FilePath.h"
+#include "UnorderedCache.h"
 
 class FilePathFilter;
 

src/lib/utility/file/FileSystem.cpp

@@ -1,11 +1,11 @@
-#include "utility/file/FileSystem.h"
+#include "FileSystem.h"
 
 #include <set>
 
-#include "boost/date_time.hpp"
-#include "boost/filesystem.hpp"
+#include <boost/date_time.hpp>
+#include <boost/filesystem.hpp>
 
-#include "utility/utilityString.h"
+#include "utilityString.h"
 
 std::vector<FilePath> FileSystem::getFilePathsFromDirectory(
 	const FilePath& path, const std::vector<std::wstring>& extensions

src/lib/utility/file/FileSystem.h

@@ -5,8 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "utility/file/FileInfo.h"
-#include "utility/TimeStamp.h"
+#include "FileInfo.h"
+#include "TimeStamp.h"
 
 class FileSystem
 {

src/lib/utility/file/FileTree.cpp

@@ -1,6 +1,6 @@
-#include "utility/file/FileTree.h"
+#include "FileTree.h"
 
-#include "utility/file/FileSystem.h"
+#include "FileSystem.h"
 
 FileTree::FileTree(const FilePath& rootPath)
 	: m_rootPath(rootPath.getAbsolute().makeCanonical())

src/lib/utility/file/FileTree.h

@@ -5,7 +5,7 @@
 #include <set>
 #include <unordered_map>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class FileTree
 {

src/lib/utility/interprocess/SharedMemory.cpp

@@ -1,7 +1,7 @@
-#include "utility/interprocess/SharedMemory.h"
+#include "SharedMemory.h"
 
-#include "utility/interprocess/SharedMemoryGarbageCollector.h"
-#include "utility/logging/logging.h"
+#include "SharedMemoryGarbageCollector.h"
+#include "logging.h"
 
 const char* SharedMemory::s_memoryNamePrefix = "srctrlmem_";
 const char* SharedMemory::s_mutexNamePrefix = "srctrlmtx_";

src/lib/utility/interprocess/SharedMemoryGarbageCollector.cpp

@@ -1,10 +1,10 @@
-#include "utility/interprocess/SharedMemoryGarbageCollector.h"
+#include "SharedMemoryGarbageCollector.h"
 
 #include <thread>
 
-#include "utility/logging/logging.h"
-#include "utility/TimeStamp.h"
-#include "utility/utility.h"
+#include "logging.h"
+#include "TimeStamp.h"
+#include "utility.h"
 
 std::string SharedMemoryGarbageCollector::s_memoryNamePrefix = "grbg_cllctr_";
 std::string SharedMemoryGarbageCollector::s_instancesKeyName = "running_instances";

src/lib/utility/interprocess/SharedMemoryGarbageCollector.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <set>
 
-#include "utility/interprocess/SharedMemory.h"
+#include "SharedMemory.h"
 
 #include <mutex>
 #include <thread>

src/lib/utility/logging/ConsoleLogger.cpp

@@ -1,4 +1,4 @@
-#include "utility/logging/ConsoleLogger.h"
+#include "ConsoleLogger.h"
 
 #include <iostream>
 

src/lib/utility/logging/ConsoleLogger.h

@@ -3,8 +3,8 @@
 
 #include <mutex>
 
-#include "utility/logging/Logger.h"
-#include "utility/logging/LogMessage.h"
+#include "Logger.h"
+#include "LogMessage.h"
 
 class ConsoleLogger
 	: public Logger

src/lib/utility/logging/FileLogger.cpp

@@ -5,8 +5,8 @@
 #include <ctime>
 #include <cstdio>
 
-#include "utility/file/FileSystem.h"
-#include "utility/utilityString.h"
+#include "FileSystem.h"
+#include "utilityString.h"
 
 std::wstring FileLogger::generateDatedFileName(const std::wstring& prefix, const std::wstring& suffix)
 {

src/lib/utility/logging/FileLogger.h

@@ -3,9 +3,9 @@
 
 #include <string>
 
-#include "utility/file/FilePath.h"
-#include "utility/logging/Logger.h"
-#include "utility/logging/LogMessage.h"
+#include "FilePath.h"
+#include "Logger.h"
+#include "LogMessage.h"
 
 class FileLogger: public Logger
 {

src/lib/utility/logging/LogManager.cpp

@@ -1,12 +1,12 @@
-#include "utility/logging/LogManager.h"
+#include "LogManager.h"
 
 #include <algorithm>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageStatus.h"
-#include "utility/utility.h"
-#include "utility/Version.h"
-#include "utility/utilityString.h"
+#include "logging.h"
+#include "MessageStatus.h"
+#include "utility.h"
+#include "Version.h"
+#include "utilityString.h"
 
 std::shared_ptr<LogManager> LogManager::getInstance()
 {

src/lib/utility/logging/LogManager.h

@@ -3,8 +3,8 @@
 
 #include <memory>
 
-#include "utility/logging/Logger.h"
-#include "utility/logging/LogManagerImplementation.h"
+#include "Logger.h"
+#include "LogManagerImplementation.h"
 
 class LogManager
 {

src/lib/utility/logging/LogManagerImplementation.h

@@ -6,7 +6,7 @@
 #include <mutex>
 #include <vector>
 
-#include "utility/logging/Logger.h"
+#include "Logger.h"
 
 class LogManagerImplementation
 {

src/lib/utility/logging/Logger.cpp

@@ -1,4 +1,4 @@
-#include "utility/logging/Logger.h"
+#include "Logger.h"
 
 Logger::Logger(const std::string& type)
 	: m_type(type)

src/lib/utility/logging/Logger.h

@@ -4,7 +4,7 @@
 #include <memory>
 #include <vector>
 
-#include "utility/logging/LogMessage.h"
+#include "LogMessage.h"
 
 class Logger
 {

src/lib/utility/logging/logging.h

@@ -3,7 +3,7 @@
 
 #include <sstream>
 
-#include "utility/logging/LogManager.h"
+#include "LogManager.h"
 
 /**
 * @brief Makros to simplify usage of the log manager

src/lib/utility/math/Vector2.h

@@ -1,10 +1,10 @@
 #ifndef VECTOR_2_H
 #define VECTOR_2_H
 
-#include "utility/logging/logging.h"
-#include "utility/Property.h"
+#include "logging.h"
+#include "Property.h"
 
-#include "utility/math/VectorBase.h"
+#include "VectorBase.h"
 
 template<class T>
 class Vector2 : public VectorBase<T, 2>

src/lib/utility/math/Vector4.h

@@ -1,10 +1,10 @@
 #ifndef VECTOR_4_H
 #define VECTOR_4_H
 
-#include "utility/logging/logging.h"
-#include "utility/Property.h"
+#include "logging.h"
+#include "Property.h"
 
-#include "utility/math/VectorBase.h"
+#include "VectorBase.h"
 
 template<class T>
 class Vector4 : public VectorBase<T, 4>

src/lib/utility/messaging/Message.h

@@ -4,8 +4,8 @@
 #include <memory>
 #include <string>
 
-#include "utility/messaging/MessageBase.h"
-#include "utility/messaging/MessageQueue.h"
+#include "MessageBase.h"
+#include "MessageQueue.h"
 
 template<typename MessageType>
 class Message

src/lib/utility/messaging/MessageBase.cpp

@@ -1,3 +1,3 @@
-#include "utility/messaging/MessageBase.h"
+#include "MessageBase.h"
 
 Id MessageBase::s_nextId = 1;

src/lib/utility/messaging/MessageBase.h

@@ -4,8 +4,8 @@
 #include <ostream>
 #include <sstream>
 
-#include "utility/types.h"
-#include "utility/utilityString.h"
+#include "types.h"
+#include "utilityString.h"
 
 class MessageBase
 {

src/lib/utility/messaging/MessageFilter.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_FILTER_H
 #define MESSAGE_FILTER_H
 
-#include "utility/messaging/MessageQueue.h"
+#include "MessageQueue.h"
 
 class MessageFilter
 {

src/lib/utility/messaging/MessageInterruptTasksCounter.cpp

@@ -1,7 +1,7 @@
-#include "utility/messaging/MessageInterruptTasksCounter.h"
+#include "MessageInterruptTasksCounter.h"
 
-#include "utility/messaging/type/MessageInterruptTasks.h"
-#include "utility/messaging/MessageListener.h"
+#include "MessageInterruptTasks.h"
+#include "MessageListener.h"
 
 MessageInterruptTasksCounter::MessageInterruptTasksCounter()
 	: m_count(0)

src/lib/utility/messaging/MessageListener.h

@@ -3,9 +3,9 @@
 
 #include <string>
 
-#include "utility/messaging/MessageBase.h"
-#include "utility/messaging/MessageListenerBase.h"
-#include "utility/messaging/MessageQueue.h"
+#include "MessageBase.h"
+#include "MessageListenerBase.h"
+#include "MessageQueue.h"
 
 template<typename MessageType>
 class MessageListener

src/lib/utility/messaging/MessageListenerBase.cpp

@@ -1,3 +1,3 @@
-#include "utility/messaging/MessageListenerBase.h"
+#include "MessageListenerBase.h"
 
 Id MessageListenerBase::s_nextId = 1;

src/lib/utility/messaging/MessageListenerBase.h

@@ -3,9 +3,9 @@
 
 #include <string>
 
-#include "utility/messaging/MessageBase.h"
-#include "utility/messaging/MessageQueue.h"
-#include "utility/types.h"
+#include "MessageBase.h"
+#include "MessageQueue.h"
+#include "types.h"
 
 class MessageListenerBase
 {

src/lib/utility/messaging/MessageQueue.cpp

@@ -1,15 +1,15 @@
-#include "utility/messaging/MessageQueue.h"
+#include "MessageQueue.h"
 
 #include <chrono>
 #include <thread>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/MessageBase.h"
-#include "utility/messaging/MessageFilter.h"
-#include "utility/messaging/MessageListenerBase.h"
-#include "utility/scheduling/TaskGroupParallel.h"
-#include "utility/scheduling/TaskGroupSequence.h"
-#include "utility/scheduling/TaskLambda.h"
+#include "logging.h"
+#include "MessageBase.h"
+#include "MessageFilter.h"
+#include "MessageListenerBase.h"
+#include "TaskGroupParallel.h"
+#include "TaskGroupSequence.h"
+#include "TaskLambda.h"
 
 std::shared_ptr<MessageQueue> MessageQueue::getInstance()
 {

src/lib/utility/messaging/MessageQueue.h

@@ -6,7 +6,7 @@
 #include <mutex>
 #include <vector>
 
-#include "utility/types.h"
+#include "types.h"
 
 class MessageBase;
 class MessageFilter;

src/lib/utility/messaging/filter_types/MessageFilterErrorCountUpdate.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
 #define MESSAGE_FILTER_ERROR_COUNT_UPDATE_H
 
-#include "utility/messaging/MessageFilter.h"
-#include "utility/messaging/type/error/MessageErrorCountUpdate.h"
+#include "MessageFilter.h"
+#include "MessageErrorCountUpdate.h"
 
 class MessageFilterErrorCountUpdate
 	: public MessageFilter

src/lib/utility/messaging/filter_types/MessageFilterFocusInOut.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGE_FILTER_FOCUS_IN_OUT_H
 #define MESSAGE_FILTER_FOCUS_IN_OUT_H
 
-#include "utility/messaging/MessageFilter.h"
-#include "utility/messaging/type/MessageFocusIn.h"
-#include "utility/messaging/type/MessageFocusOut.h"
+#include "MessageFilter.h"
+#include "MessageFocusIn.h"
+#include "MessageFocusOut.h"
 
 class MessageFilterFocusInOut
 	: public MessageFilter

src/lib/utility/messaging/filter_types/MessageFilterSearchAutocomplete.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H
 #define MESSAGE_FILTER_SEARCH_AUTOCOMPLETE_H
 
-#include "utility/messaging/MessageFilter.h"
-#include "utility/messaging/type/MessageSearchAutocomplete.h"
+#include "MessageFilter.h"
+#include "MessageSearchAutocomplete.h"
 
 class MessageFilterSearchAutocomplete
 	: public MessageFilter

src/lib/utility/messaging/type/MessageActivateAll.h

@@ -1,10 +1,10 @@
 #ifndef MESSAGE_ACTIVATE_ALL_H
 #define MESSAGE_ACTIVATE_ALL_H
 
-#include "utility/messaging/Message.h"
-#include "utility/messaging/type/MessageActivateBase.h"
+#include "Message.h"
+#include "MessageActivateBase.h"
 
-#include "data/NodeTypeSet.h"
+#include "NodeTypeSet.h"
 
 class MessageActivateAll
 	: public Message<MessageActivateAll>

src/lib/utility/messaging/type/MessageActivateBase.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_ACTIVATE_BASE_H
 #define MESSAGE_ACTIVATE_BASE_H
 
-#include "data/search/SearchMatch.h"
+#include "SearchMatch.h"
 
 class MessageActivateBase
 {

src/lib/utility/messaging/type/MessageActivateBookmark.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGE_ACTIVATE_BOOKMARK_H
 #define MESSAGE_ACTIVATE_BOOKMARK_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
-#include "data/bookmark/Bookmark.h"
+#include "Bookmark.h"
 
 class MessageActivateBookmark
 	: public Message<MessageActivateBookmark>

src/lib/utility/messaging/type/MessageActivateEdge.h

@@ -1,12 +1,12 @@
 #ifndef MESSAGE_ACTIVATE_EDGE_H
 #define MESSAGE_ACTIVATE_EDGE_H
 
-#include "data/graph/Edge.h"
-#include "data/name/NameHierarchy.h"
+#include "Edge.h"
+#include "NameHierarchy.h"
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
-#include "utility/utilityString.h"
+#include "Message.h"
+#include "types.h"
+#include "utilityString.h"
 
 class MessageActivateEdge
 	: public Message<MessageActivateEdge>

src/lib/utility/messaging/type/MessageActivateFile.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_FILE_H
 #define MESSAGE_ACTIVATE_FILE_H
 
-#include "utility/messaging/Message.h"
-#include "utility/file/FilePath.h"
+#include "Message.h"
+#include "FilePath.h"
 
 class MessageActivateFile: public Message<MessageActivateFile>
 {

src/lib/utility/messaging/type/MessageActivateFullTextSearch.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H
 #define MESSAGE_ACTIVATE_FULLTEXT_SEARCH_H
 
-#include "utility/messaging/Message.h"
-#include "utility/messaging/type/MessageActivateBase.h"
+#include "Message.h"
+#include "MessageActivateBase.h"
 
 class MessageActivateFullTextSearch
 	: public Message<MessageActivateFullTextSearch>

src/lib/utility/messaging/type/MessageActivateLocalSymbols.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H
 #define MESSAGE_ACTIVATE_LOCAL_SYMBOLS_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageActivateLocalSymbols
 	: public Message<MessageActivateLocalSymbols>

src/lib/utility/messaging/type/MessageActivateNodes.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_NODES_H
 #define MESSAGE_ACTIVATE_NODES_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageActivateNodes
 	: public Message<MessageActivateNodes>

src/lib/utility/messaging/type/MessageActivateSourceLocations.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H
 #define MESSAGE_ACTIVATE_SOURCE_LOCATIONS_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageActivateSourceLocations
 	: public Message<MessageActivateSourceLocations>

src/lib/utility/messaging/type/MessageActivateTokenIds.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_TOKEN_IDS_H
 #define MESSAGE_ACTIVATE_TOKEN_IDS_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageActivateTokenIds
 	: public Message<MessageActivateTokenIds>

src/lib/utility/messaging/type/MessageActivateTokens.h

@@ -1,11 +1,11 @@
 #ifndef MESSAGE_ACTIVATE_TOKENS_H
 #define MESSAGE_ACTIVATE_TOKENS_H
 
-#include "utility/messaging/Message.h"
-#include "utility/messaging/type/MessageActivateBase.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "MessageActivateBase.h"
+#include "types.h"
 
-#include "data/search/SearchMatch.h"
+#include "SearchMatch.h"
 
 class MessageActivateTokens
 	: public Message<MessageActivateTokens>

src/lib/utility/messaging/type/MessageActivateTrail.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_ACTIVATE_TRAIL_H
 #define MESSAGE_ACTIVATE_TRAIL_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageActivateTrail
 	: public Message<MessageActivateTrail>

src/lib/utility/messaging/type/MessageActivateTrailEdge.h

@@ -1,12 +1,12 @@
 #ifndef MESSAGE_ACTIVATE_TRAIL_EDGE_H
 #define MESSAGE_ACTIVATE_TRAIL_EDGE_H
 
-#include "data/graph/Edge.h"
-#include "data/name/NameHierarchy.h"
+#include "Edge.h"
+#include "NameHierarchy.h"
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
-#include "utility/utilityString.h"
+#include "Message.h"
+#include "types.h"
+#include "utilityString.h"
 
 class MessageActivateTrailEdge
 	: public Message<MessageActivateTrailEdge>

src/lib/utility/messaging/type/MessageActivateWindow.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_ACTIVATE_WINDOW_H
 #define MESSAGE_ACTIVATE_WINDOW_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageActivateWindow
 	: public Message<MessageActivateWindow>

src/lib/utility/messaging/type/MessageChangeFileView.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_CHANGE_FILE_VIEW_H
 #define MESSAGE_CHANGE_FILE_VIEW_H
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/Message.h"
+#include "FilePath.h"
+#include "Message.h"
 
 class MessageChangeFileView
 	: public Message<MessageChangeFileView>

src/lib/utility/messaging/type/MessageClearLogView.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_CLEAR_LOG_VIEW_H
 #define MESSAGE_CLEAR_LOG_VIEW_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageClearLogView:
 	public Message<MessageClearLogView>

src/lib/utility/messaging/type/MessageClearStatusView.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_CLEAR_STATUS_VIEW_H
 #define MESSAGE_CLEAR_STATUS_VIEW_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageClearStatusView:
 	public Message<MessageClearStatusView>

src/lib/utility/messaging/type/MessageCodeReference.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_CODE_REFERENCE_H
 #define MESSAGE_CODE_REFERENCE_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageCodeReference
 	: public Message<MessageCodeReference>

src/lib/utility/messaging/type/MessageDeactivateEdge.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_DEACTIVATE_EDGE_H
 #define MESSAGE_DEACTIVATE_EDGE_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageDeactivateEdge
 	: public Message<MessageDeactivateEdge>

src/lib/utility/messaging/type/MessageDisplayBookmarkCreator.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_DISPLAY_BOOKMARK_CREATOR_H
 #define MESSAGE_DISPLAY_BOOKMARK_CREATOR_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageDisplayBookmarkCreator
 	: public Message<MessageDisplayBookmarkCreator>

src/lib/utility/messaging/type/MessageDisplayBookmarks.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_DISPLAY_BOOKMARKS_H
 #define MESSAGE_DISPLAY_BOOKMARKS_H
 
-#include "data/bookmark/Bookmark.h"
-#include "utility/messaging/Message.h"
+#include "Bookmark.h"
+#include "Message.h"
 
 class MessageDisplayBookmarks
 	: public Message<MessageDisplayBookmarks>

src/lib/utility/messaging/type/MessageEnteredLicense.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_ENTERED_LICENSE_H
 #define MESSAGE_ENTERED_LICENSE_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageEnteredLicense
 	: public Message<MessageEnteredLicense>

src/lib/utility/messaging/type/MessageFind.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_FIND_H
 #define MESSAGE_FIND_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageFind
 	: public Message<MessageFind>

src/lib/utility/messaging/type/MessageFlushUpdates.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_FLUSH_UPDATES_H
 #define MESSAGE_FLUSH_UPDATES_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageFlushUpdates:
 	public Message<MessageFlushUpdates>

src/lib/utility/messaging/type/MessageFocusIn.h

@@ -3,10 +3,10 @@
 
 #include <vector>
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
-#include "data/tooltip/TooltipOrigin.h"
+#include "TooltipOrigin.h"
 
 class MessageFocusIn
 	: public Message<MessageFocusIn>

src/lib/utility/messaging/type/MessageFocusOut.h

@@ -3,8 +3,8 @@
 
 #include <vector>
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageFocusOut
 	: public Message<MessageFocusOut>

src/lib/utility/messaging/type/MessageForceEnterLicense.h

@@ -2,7 +2,7 @@
 #define MESSAGE_FORCE_ENTER_LICENSE_H
 
 #include "LicenseChecker.h"
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageForceEnterLicense
 	: public Message<MessageForceEnterLicense>

src/lib/utility/messaging/type/MessageGraphNodeBundleSplit.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H
 #define MESSAGE_GRAPH_NODE_BUNDLE_SPLIT_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageGraphNodeBundleSplit
 	: public Message<MessageGraphNodeBundleSplit>

src/lib/utility/messaging/type/MessageGraphNodeExpand.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_GRAPH_NODE_EXPAND_H
 #define MESSAGE_GRAPH_NODE_EXPAND_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageGraphNodeExpand
 	: public Message<MessageGraphNodeExpand>

src/lib/utility/messaging/type/MessageGraphNodeHide.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_GRAPH_NODE_HIDE_H
 #define MESSAGE_GRAPH_NODE_HIDE_H
 
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageGraphNodeHide
 	: public Message<MessageGraphNodeHide>

src/lib/utility/messaging/type/MessageGraphNodeMove.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGE_GRAPH_NODE_MOVE_H
 #define MESSAGE_GRAPH_NODE_MOVE_H
 
-#include "utility/math/Vector2.h"
-#include "utility/messaging/Message.h"
-#include "utility/types.h"
+#include "Vector2.h"
+#include "Message.h"
+#include "types.h"
 
 class MessageGraphNodeMove
 	: public Message<MessageGraphNodeMove>

src/lib/utility/messaging/type/MessageIDECreateCDB.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_IDE_CREATE_CDB_H
 #define MESSAGE_IDE_CREATE_CDB_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageIDECreateCDB : public Message<MessageIDECreateCDB>
 {

src/lib/utility/messaging/type/MessageInterruptTasks.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_INTERRUPT_TASKS_H
 #define MESSAGE_INTERRUPT_TASKS_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageInterruptTasks:
 	public Message<MessageInterruptTasks>

src/lib/utility/messaging/type/MessageLoadProject.h

@@ -1,10 +1,10 @@
 #ifndef MESSAGE_LOAD_PROJECT_H
 #define MESSAGE_LOAD_PROJECT_H
 
-#include "project/RefreshInfo.h"
+#include "RefreshInfo.h"
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/Message.h"
+#include "FilePath.h"
+#include "Message.h"
 
 class MessageLoadProject
 	: public Message<MessageLoadProject>

src/lib/utility/messaging/type/MessageLogFilterChanged.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_LOG_FILTER_CHANGED_H
 #define MESSAGE_LOG_FILTER_CHANGED_H
 
-#include "utility/messaging/Message.h"
-#include "utility/logging/Logger.h"
+#include "Message.h"
+#include "Logger.h"
 
 class MessageLogFilterChanged
 	: public Message<MessageLogFilterChanged>

src/lib/utility/messaging/type/MessageMoveIDECursor.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_MOVE_IDE_CURSOR_H
 #define MESSAGE_MOVE_IDE_CURSOR_H
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/Message.h"
+#include "FilePath.h"
+#include "Message.h"
 
 class MessageMoveIDECursor : public Message<MessageMoveIDECursor>
 {

src/lib/utility/messaging/type/MessagePingReceived.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_PING_RECEIVED_H
 #define MESSAGE_PING_RECEIVED_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessagePingReceived
 	: public Message<MessagePingReceived>

src/lib/utility/messaging/type/MessagePluginPortChange.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_PLUGIN_PORT_CHANGE_H
 #define MESSAGE_PLUGIN_PORT_CHANGE_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessagePluginPortChange
 	: public Message<MessagePluginPortChange>

src/lib/utility/messaging/type/MessageProjectEdit.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_PROJECT_EDIT_H
 #define MESSAGE_PROJECT_EDIT_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageProjectEdit
 	: public Message<MessageProjectEdit>

src/lib/utility/messaging/type/MessageProjectNew.h

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_PROJECT_NEW_H
 #define MESSAGE_PROJECT_NEW_H
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/Message.h"
+#include "FilePath.h"
+#include "Message.h"
 
 class MessageProjectNew
 	: public Message<MessageProjectNew>

src/lib/utility/messaging/type/MessageQuitApplication.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_QUIT_APPLICATION_H
 #define MESSAGE_QUIT_APPLICATION_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageQuitApplication
 	: public Message<MessageQuitApplication>

src/lib/utility/messaging/type/MessageRefresh.h

@@ -1,7 +1,7 @@
 #ifndef MESSAGE_REFRESH_H
 #define MESSAGE_REFRESH_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageRefresh
 	: public Message<MessageRefresh>