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/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>

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

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

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

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

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

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

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

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

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

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

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

@@ -1,10 +1,10 @@
 #ifndef MESSAGE_SEARCH_H
 #define MESSAGE_SEARCH_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
-#include "data/NodeTypeSet.h"
-#include "data/search/SearchMatch.h"
+#include "NodeTypeSet.h"
+#include "SearchMatch.h"
 
 class MessageSearch
 	: public Message<MessageSearch>

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

@@ -1,9 +1,9 @@
 #ifndef MESSAGE_SEARCH_AUTOCOMPLETE_H
 #define MESSAGE_SEARCH_AUTOCOMPLETE_H
 
-#include "data/graph/Node.h"
-#include "data/NodeTypeSet.h"
-#include "utility/messaging/Message.h"
+#include "Node.h"
+#include "NodeTypeSet.h"
+#include "Message.h"
 
 class MessageSearchAutocomplete
 	: public Message<MessageSearchAutocomplete>

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

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

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

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

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

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

src/lib/utility/messaging/type/MessageStatus.cpp

@@ -1,6 +1,6 @@
-#include "utility/messaging/type/MessageStatus.h"
+#include "MessageStatus.h"
 
-#include "utility/utilityString.h"
+#include "utilityString.h"
 
 MessageStatus::MessageStatus(const std::wstring& status, bool isError, bool showLoader, bool showInStatusBar)
 	: isError(isError)

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

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
 class MessageStatus
 	: public Message<MessageStatus>

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

@@ -1,8 +1,8 @@
 #ifndef MESSAGE_STATUS_FILTER_CHANGED_H
 #define MESSAGE_STATUS_FILTER_CHANGED_H
 
-#include "utility/messaging/Message.h"
-#include "utility/Status.h"
+#include "Message.h"
+#include "Status.h"
 
 class MessageStatusFilterChanged
 	: public Message<MessageStatusFilterChanged>

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

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

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

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

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

@@ -1,10 +1,10 @@
 #ifndef MESSAGE_TOOLTIP_SHOW_H
 #define MESSAGE_TOOLTIP_SHOW_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
-#include "data/tooltip/TooltipOrigin.h"
-#include "data/tooltip/TooltipInfo.h"
+#include "TooltipOrigin.h"
+#include "TooltipInfo.h"
 
 class MessageTooltipShow
 	: public Message<MessageTooltipShow>

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

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

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

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

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

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

src/lib/utility/messaging/type/activation/MessageActivateLegend.h

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

src/lib/utility/messaging/type/code/MessageCodeShowDefinition.h

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

src/lib/utility/messaging/type/error/MessageActivateErrors.h

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

src/lib/utility/messaging/type/error/MessageErrorCountClear.h

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

src/lib/utility/messaging/type/error/MessageErrorCountUpdate.h

@@ -1,9 +1,9 @@
 #ifndef MESSAGE_ERROR_COUNT_UPDATE_H
 #define MESSAGE_ERROR_COUNT_UPDATE_H
 
-#include "utility/messaging/Message.h"
+#include "Message.h"
 
-#include "data/ErrorCountInfo.h"
+#include "ErrorCountInfo.h"
 
 class MessageErrorCountUpdate
 	: public Message<MessageErrorCountUpdate>

src/lib/utility/messaging/type/error/MessageErrorsAll.h

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

src/lib/utility/messaging/type/error/MessageErrorsForFile.h

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

src/lib/utility/messaging/type/error/MessageErrorsHelpMessage.h

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

src/lib/utility/messaging/type/error/MessageShowError.h

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

src/lib/utility/messaging/type/history/MessageHistoryRedo.h

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

src/lib/utility/messaging/type/history/MessageHistoryToPosition.h

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

src/lib/utility/messaging/type/history/MessageHistoryUndo.h

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

src/lib/utility/messaging/type/indexing/MessageIndexingFinished.h

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

src/lib/utility/messaging/type/indexing/MessageIndexingShowDialog.h

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

src/lib/utility/messaging/type/indexing/MessageIndexingStarted.h

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

src/lib/utility/messaging/type/indexing/MessageIndexingStatus.h

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