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

@@ -1,5 +1,5 @@
 add_files(
-	LIB_GUI_FILES
+	LIB_GUI
 
 	platform_includes/includesLinux.h
 	platform_includes/includesMac.h

src/lib_gui/platform_includes/includes.h.in

@@ -5,6 +5,6 @@ void setupPlatform(int argc, char *argv[]);
 void setupApp(int argc, char *argv[]);
 
 // platform specific include
-#include "platform_includes/@PLATFORM_INCLUDE@"
+#include "@PLATFORM_INCLUDE@"
 
 #endif // INCLUDES_H

src/lib_gui/platform_includes/includesLinux.h

@@ -4,14 +4,14 @@
 #include <QCoreApplication>
 #include <QDir>
 
-#include "qt/utility/utilityQt.h"
-#include "utility/AppPath.h"
-#include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
-#include "utility/ResourcePaths.h"
-#include "utility/UserPaths.h"
+#include "utilityQt.h"
+#include "AppPath.h"
+#include "FilePath.h"
+#include "FileSystem.h"
+#include "ResourcePaths.h"
+#include "UserPaths.h"
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 void setupPlatform(int argc, char *argv[])
 {

src/lib_gui/platform_includes/includesMac.h

@@ -6,11 +6,11 @@
 #include <QDir>
 #include <QStandardPaths>
 
-#include "qt/utility/utilityQt.h"
-#include "utility/AppPath.h"
-#include "utility/file/FilePath.h"
-#include "utility/ResourcePaths.h"
-#include "utility/UserPaths.h"
+#include "utilityQt.h"
+#include "AppPath.h"
+#include "FilePath.h"
+#include "ResourcePaths.h"
+#include "UserPaths.h"
 
 
 void setupPlatform(int argc, char *argv[])

src/lib_gui/platform_includes/includesWindows.h

@@ -7,11 +7,11 @@
 
 #include "vld.h"
 
-#include "utility/file/FileSystem.h"
-#include "utility/AppPath.h"
-#include "utility/ResourcePaths.h"
-#include "utility/UserPaths.h"
-#include "utility/utility.h"
+#include "FileSystem.h"
+#include "AppPath.h"
+#include "ResourcePaths.h"
+#include "UserPaths.h"
+#include "utility.h"
 
 void setupPlatform(int argc, char *argv[])
 {

src/lib_gui/qt/QtApplication.cpp

@@ -1,12 +1,12 @@
-#include "qt/QtApplication.h"
+#include "QtApplication.h"
 
 #include <QFileOpenEvent>
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/type/MessageLoadProject.h"
-#include "utility/messaging/type/MessageWindowFocus.h"
-#include "utility/logging/LogManager.h"
-#include "utility/utilityApp.h"
+#include "FilePath.h"
+#include "MessageLoadProject.h"
+#include "MessageWindowFocus.h"
+#include "LogManager.h"
+#include "utilityApp.h"
 
 QtApplication::QtApplication(int& argc, char** argv)
 	: QApplication(argc, argv)

src/lib_gui/qt/QtCoreApplication.cpp

@@ -1,4 +1,4 @@
-#include "qt/QtCoreApplication.h"
+#include "QtCoreApplication.h"
 
 #include <iostream>
 

src/lib_gui/qt/QtCoreApplication.h

@@ -3,9 +3,9 @@
 
 #include <QCoreApplication>
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageQuitApplication.h"
-#include "utility/messaging/type/MessageStatus.h"
+#include "MessageListener.h"
+#include "MessageQuitApplication.h"
+#include "MessageStatus.h"
 
 class QtCoreApplication
 	: public QCoreApplication

src/lib_gui/qt/element/QtAutocompletionList.cpp

@@ -1,14 +1,14 @@
-#include "qt/element/QtAutocompletionList.h"
+#include "QtAutocompletionList.h"
 
 #include <QPainter>
 #include <QScrollBar>
 
-#include "component/view/GraphViewStyle.h"
-#include "qt/utility/QtDeviceScaledPixmap.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityString.h"
+#include "GraphViewStyle.h"
+#include "QtDeviceScaledPixmap.h"
+#include "ApplicationSettings.h"
+#include "ColorScheme.h"
+#include "ResourcePaths.h"
+#include "utilityString.h"
 
 QtAutocompletionModel::QtAutocompletionModel(QObject* parent)
 	: QAbstractTableModel(parent)

src/lib_gui/qt/element/QtAutocompletionList.h

@@ -9,8 +9,8 @@
 #include <QStyledItemDelegate>
 #include <QListView>
 
-#include "data/search/SearchMatch.h"
-#include "qt/utility/QtDeviceScaledPixmap.h"
+#include "SearchMatch.h"
+#include "QtDeviceScaledPixmap.h"
 
 class QtAutocompletionModel
 	: public QAbstractTableModel

src/lib_gui/qt/element/QtBookmark.cpp

@@ -6,8 +6,8 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "qt/utility/utilityQt.h"
-#include "utility/ResourcePaths.h"
+#include "utilityQt.h"
+#include "ResourcePaths.h"
 
 QtBookmark::QtBookmark(ControllerProxy<BookmarkController>* controllerProxy)
 	: m_controllerProxy(controllerProxy)

src/lib_gui/qt/element/QtBookmark.h

@@ -6,9 +6,9 @@
 #include <QPushButton>
 #include <QTreeWidget>
 
-#include "component/controller/BookmarkController.h"
-#include "component/controller/helper/ControllerProxy.h"
-#include "data/bookmark/Bookmark.h"
+#include "BookmarkController.h"
+#include "ControllerProxy.h"
+#include "Bookmark.h"
 
 class Bookmark;
 

src/lib_gui/qt/element/QtBookmarkCategory.cpp

@@ -6,8 +6,8 @@
 #include <QPushButton>
 #include <QTreeWidget>
 
-#include "qt/utility/utilityQt.h"
-#include "utility/ResourcePaths.h"
+#include "utilityQt.h"
+#include "ResourcePaths.h"
 
 QtBookmarkCategory::QtBookmarkCategory(ControllerProxy<BookmarkController>* controllerProxy)
 	: m_controllerProxy(controllerProxy)

src/lib_gui/qt/element/QtBookmarkCategory.h

@@ -3,9 +3,9 @@
 
 #include <QFrame>
 
-#include "component/controller/BookmarkController.h"
-#include "component/controller/helper/ControllerProxy.h"
-#include "utility/types.h"
+#include "BookmarkController.h"
+#include "ControllerProxy.h"
+#include "types.h"
 
 class QLabel;
 class QPushButton;

src/lib_gui/qt/element/QtCodeArea.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtCodeArea.h"
+#include "QtCodeArea.h"
 
 #include <algorithm>
 
@@ -13,20 +13,20 @@
 #include <QTextBlock>
 #include <QToolTip>
 
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeNavigator.h"
-#include "qt/utility/QtContextMenu.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
-#include "utility/messaging/type/error/MessageShowError.h"
-#include "utility/messaging/type/MessageActivateLocalSymbols.h"
-#include "utility/messaging/type/MessageFocusIn.h"
-#include "utility/messaging/type/MessageFocusOut.h"
-#include "utility/messaging/type/MessageMoveIDECursor.h"
-#include "utility/TextCodec.h"
-#include "utility/utility.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
+#include "SourceLocationFile.h"
+#include "QtCodeNavigator.h"
+#include "QtContextMenu.h"
+#include "ApplicationSettings.h"
+#include "ColorScheme.h"
+#include "MessageShowError.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageFocusIn.h"
+#include "MessageFocusOut.h"
+#include "MessageMoveIDECursor.h"
+#include "TextCodec.h"
+#include "utility.h"
+#include "utilityApp.h"
+#include "utilityString.h"
 
 MouseWheelOverScrollbarFilter::MouseWheelOverScrollbarFilter()
 {

src/lib_gui/qt/element/QtCodeArea.h

@@ -4,8 +4,8 @@
 #include <memory>
 #include <vector>
 
-#include "qt/element/QtCodeField.h"
-#include "qt/utility/QtScrollSpeedChangeListener.h"
+#include "QtCodeField.h"
+#include "QtScrollSpeedChangeListener.h"
 
 class QDragMoveEvent;
 class QPaintEvent;

src/lib_gui/qt/element/QtCodeField.cpp

@@ -4,18 +4,18 @@
 #include <QTextBlock>
 #include <QTextCodec>
 
-#include "data/location/SourceLocation.h"
-#include "data/location/SourceLocationFile.h"
-#include "qt/utility/QtHighlighter.h"
-#include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
-#include "utility/messaging/type/MessageActivateLocalSymbols.h"
-#include "utility/messaging/type/MessageActivateSourceLocations.h"
-#include "utility/messaging/type/MessageActivateTokenIds.h"
-#include "utility/messaging/type/MessageTooltipShow.h"
-#include "utility/TextCodec.h"
-#include "utility/tracing.h"
-#include "utility/utility.h"
+#include "SourceLocation.h"
+#include "SourceLocationFile.h"
+#include "QtHighlighter.h"
+#include "ApplicationSettings.h"
+#include "ColorScheme.h"
+#include "MessageActivateLocalSymbols.h"
+#include "MessageActivateSourceLocations.h"
+#include "MessageActivateTokenIds.h"
+#include "MessageTooltipShow.h"
+#include "TextCodec.h"
+#include "tracing.h"
+#include "utility.h"
 
 std::vector<QtCodeField::AnnotationColor> QtCodeField::s_annotationColors;
 

src/lib_gui/qt/element/QtCodeField.h

@@ -6,8 +6,8 @@
 
 #include <QPlainTextEdit>
 
-#include "data/location/LocationType.h"
-#include "utility/types.h"
+#include "LocationType.h"
+#include "types.h"
 
 class QtHighlighter;
 class SourceLocation;

src/lib_gui/qt/element/QtCodeFile.cpp

@@ -1,13 +1,13 @@
-#include "qt/element/QtCodeFile.h"
+#include "QtCodeFile.h"
 
 #include <QVBoxLayout>
 
-#include "utility/messaging/type/MessageChangeFileView.h"
+#include "MessageChangeFileView.h"
 
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeFileTitleBar.h"
-#include "qt/element/QtCodeNavigator.h"
-#include "qt/element/QtCodeSnippet.h"
+#include "SourceLocationFile.h"
+#include "QtCodeFileTitleBar.h"
+#include "QtCodeNavigator.h"
+#include "QtCodeSnippet.h"
 
 QtCodeFile::QtCodeFile(const FilePath& filePath, QtCodeNavigator* navigator)
 	: QFrame()

src/lib_gui/qt/element/QtCodeFile.h

@@ -8,9 +8,9 @@
 
 #include <QFrame>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
-#include "component/view/helper/CodeSnippetParams.h"
+#include "CodeSnippetParams.h"
 
 class QtCodeArea;
 class QtCodeFileTitleBar;

src/lib_gui/qt/element/QtCodeFileList.cpp

@@ -1,21 +1,21 @@
-#include "qt/element/QtCodeFileList.h"
+#include "QtCodeFileList.h"
 
 #include <QScrollBar>
 #include <QVBoxLayout>
 #include <QTimer>
 
-#include "utility/file/FilePath.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityApp.h"
-#include "utility/utility.h"
+#include "FilePath.h"
+#include "ResourcePaths.h"
+#include "utilityApp.h"
+#include "utility.h"
 
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeFile.h"
-#include "qt/element/QtCodeFileTitleBar.h"
-#include "qt/element/QtCodeNavigator.h"
-#include "qt/element/QtCodeSnippet.h"
-#include "qt/utility/utilityQt.h"
-#include "settings/ColorScheme.h"
+#include "SourceLocationFile.h"
+#include "QtCodeFile.h"
+#include "QtCodeFileTitleBar.h"
+#include "QtCodeNavigator.h"
+#include "QtCodeSnippet.h"
+#include "utilityQt.h"
+#include "ColorScheme.h"
 
 QtCodeFileList::QtCodeFileList(QtCodeNavigator* navigator)
 	: QFrame()

src/lib_gui/qt/element/QtCodeFileList.h

@@ -6,9 +6,9 @@
 #include <QFrame>
 #include <QScrollArea>
 
-#include "component/view/helper/CodeSnippetParams.h"
-#include "qt/element/QtCodeNavigateable.h"
-#include "qt/utility/QtScrollSpeedChangeListener.h"
+#include "CodeSnippetParams.h"
+#include "QtCodeNavigateable.h"
+#include "QtScrollSpeedChangeListener.h"
 
 class QtCodeFile;
 class QtCodeFileTitleBar;

src/lib_gui/qt/element/QtCodeFileSingle.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtCodeFileSingle.h"
+#include "QtCodeFileSingle.h"
 
 #include <QLabel>
 #include <QPushButton>
@@ -6,16 +6,16 @@
 #include <QScrollBar>
 #include <QVBoxLayout>
 
-#include "utility/file/FilePath.h"
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/MessageChangeFileView.h"
+#include "FilePath.h"
+#include "logging.h"
+#include "MessageChangeFileView.h"
 
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeArea.h"
-#include "qt/element/QtCodeFileTitleBar.h"
-#include "qt/element/QtCodeFileTitleButton.h"
-#include "qt/element/QtCodeNavigator.h"
-#include "qt/utility/utilityQt.h"
+#include "SourceLocationFile.h"
+#include "QtCodeArea.h"
+#include "QtCodeFileTitleBar.h"
+#include "QtCodeFileTitleButton.h"
+#include "QtCodeNavigator.h"
+#include "utilityQt.h"
 
 QtCodeFileSingle::QtCodeFileSingle(QtCodeNavigator* navigator, QWidget* parent)
 	: m_navigator(navigator)

src/lib_gui/qt/element/QtCodeFileSingle.h

@@ -6,10 +6,10 @@
 
 #include <QFrame>
 
-#include "utility/file/FilePath.h"
-#include "utility/TimeStamp.h"
+#include "FilePath.h"
+#include "TimeStamp.h"
 
-#include "qt/element/QtCodeNavigateable.h"
+#include "QtCodeNavigateable.h"
 
 class QLabel;
 class QPushButton;

src/lib_gui/qt/element/QtCodeFileTitleBar.cpp

@@ -1,11 +1,11 @@
-#include "qt/element/QtCodeFileTitleBar.h"
+#include "QtCodeFileTitleBar.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QVariant>
 
-#include "utility/ResourcePaths.h"
-#include "utility/messaging/type/error/MessageErrorsForFile.h"
+#include "ResourcePaths.h"
+#include "MessageErrorsForFile.h"
 
 QtCodeFileTitleBar::QtCodeFileTitleBar(QWidget* parent, bool isHovering, bool isSingle)
 	: QtHoverButton(parent)

src/lib_gui/qt/element/QtCodeFileTitleBar.h

@@ -1,8 +1,8 @@
 #ifndef QT_CODE_FILE_TITLE_BAR_H
 #define QT_CODE_FILE_TITLE_BAR_H
 
-#include "qt/element/QtCodeFileTitleButton.h"
-#include "qt/element/QtIconButton.h"
+#include "QtCodeFileTitleButton.h"
+#include "QtIconButton.h"
 
 class QLabel;
 class QtCodeFileTitleButton;

src/lib_gui/qt/element/QtCodeFileTitleButton.cpp

@@ -1,15 +1,15 @@
-#include "qt/element/QtCodeFileTitleButton.h"
+#include "QtCodeFileTitleButton.h"
 
-#include "utility/file/FileSystem.h"
-#include "utility/messaging/type/MessageActivateFile.h"
-#include "utility/messaging/type/MessageProjectEdit.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityString.h"
+#include "FileSystem.h"
+#include "MessageActivateFile.h"
+#include "MessageProjectEdit.h"
+#include "ResourcePaths.h"
+#include "utilityString.h"
 
 #include "Application.h"
-#include "project/Project.h"
-#include "qt/utility/QtContextMenu.h"
-#include "settings/ColorScheme.h"
+#include "Project.h"
+#include "QtContextMenu.h"
+#include "ColorScheme.h"
 
 QtCodeFileTitleButton::QtCodeFileTitleButton(QWidget* parent)
 	: QtSelfRefreshIconButton("", FilePath(), "code/file/title", parent)

src/lib_gui/qt/element/QtCodeFileTitleButton.h

@@ -1,10 +1,10 @@
 #ifndef QT_CODE_FILE_TITLE_BUTTON_H
 #define QT_CODE_FILE_TITLE_BUTTON_H
 
-#include "utility/file/FilePath.h"
-#include "utility/TimeStamp.h"
+#include "FilePath.h"
+#include "TimeStamp.h"
 
-#include "qt/element/QtIconButton.h"
+#include "QtIconButton.h"
 
 class QtCodeFileTitleButton
 	: public QtSelfRefreshIconButton

src/lib_gui/qt/element/QtCodeNavigateable.cpp

@@ -1,10 +1,10 @@
-#include "qt/element/QtCodeNavigateable.h"
+#include "QtCodeNavigateable.h"
 
 #include <QPropertyAnimation>
 #include <QScrollArea>
 #include <QScrollBar>
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 QtCodeNavigateable::~QtCodeNavigateable()
 {

src/lib_gui/qt/element/QtCodeNavigateable.h

@@ -3,9 +3,9 @@
 
 #include <set>
 
-#include "utility/types.h"
+#include "types.h"
 
-#include "component/view/helper/CodeSnippetParams.h"
+#include "CodeSnippetParams.h"
 
 class FilePath;
 class QRectF;

src/lib_gui/qt/element/QtCodeNavigator.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtCodeNavigator.h"
+#include "QtCodeNavigator.h"
 
 #include <QHBoxLayout>
 #include <QLabel>
@@ -6,21 +6,21 @@
 #include <QTimer>
 #include <QVBoxLayout>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/error/MessageShowError.h"
-#include "utility/messaging/type/MessageScrollCode.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utility.h"
+#include "logging.h"
+#include "MessageShowError.h"
+#include "MessageScrollCode.h"
+#include "ResourcePaths.h"
+#include "utility.h"
 
-#include "data/location/SourceLocation.h"
-#include "data/location/SourceLocationCollection.h"
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeArea.h"
-#include "qt/element/QtCodeFile.h"
-#include "qt/element/QtCodeSnippet.h"
-#include "qt/element/QtSearchBarButton.h"
-#include "qt/utility/utilityQt.h"
-#include "settings/ApplicationSettings.h"
+#include "SourceLocation.h"
+#include "SourceLocationCollection.h"
+#include "SourceLocationFile.h"
+#include "QtCodeArea.h"
+#include "QtCodeFile.h"
+#include "QtCodeSnippet.h"
+#include "QtSearchBarButton.h"
+#include "utilityQt.h"
+#include "ApplicationSettings.h"
 
 QtCodeNavigator::QtCodeNavigator(QWidget* parent)
 	: QWidget(parent)

src/lib_gui/qt/element/QtCodeNavigator.h

@@ -3,17 +3,17 @@
 
 #include <QWidget>
 
-#include "data/ErrorInfo.h"
-#include "data/location/LocationType.h"
-#include "qt/element/QtCodeFileList.h"
-#include "qt/element/QtCodeFileSingle.h"
-#include "qt/utility/QtThreadedFunctor.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/indexing/MessageIndexingFinished.h"
-#include "utility/messaging/type/MessageCodeReference.h"
-#include "utility/messaging/type/MessageShowReference.h"
-#include "utility/messaging/type/MessageSwitchColorScheme.h"
-#include "utility/messaging/type/MessageWindowFocus.h"
+#include "ErrorInfo.h"
+#include "LocationType.h"
+#include "QtCodeFileList.h"
+#include "QtCodeFileSingle.h"
+#include "QtThreadedFunctor.h"
+#include "MessageListener.h"
+#include "MessageIndexingFinished.h"
+#include "MessageCodeReference.h"
+#include "MessageShowReference.h"
+#include "MessageSwitchColorScheme.h"
+#include "MessageWindowFocus.h"
 
 class QLabel;
 class QPushButton;

src/lib_gui/qt/element/QtCodeSnippet.cpp

@@ -1,14 +1,14 @@
-#include "qt/element/QtCodeSnippet.h"
+#include "QtCodeSnippet.h"
 
 #include <QBoxLayout>
 #include <qmenu.h>
 #include <QPushButton>
 
-#include "utility/messaging/type/MessageShowScope.h"
+#include "MessageShowScope.h"
 
-#include "data/location/SourceLocationFile.h"
-#include "qt/element/QtCodeNavigator.h"
-#include "qt/element/QtCodeFile.h"
+#include "SourceLocationFile.h"
+#include "QtCodeNavigator.h"
+#include "QtCodeFile.h"
 
 QtCodeSnippet* QtCodeSnippet::merged(
 	QtCodeSnippet* a, QtCodeSnippet* b, QtCodeNavigator* navigator, QtCodeFile* file)

src/lib_gui/qt/element/QtCodeSnippet.h

@@ -5,11 +5,11 @@
 
 #include <QFrame>
 
-#include "utility/types.h"
+#include "types.h"
 
-#include "qt/element/QtCodeArea.h"
+#include "QtCodeArea.h"
 
-#include "component/view/helper/CodeSnippetParams.h"
+#include "CodeSnippetParams.h"
 
 class QBoxLayout;
 class QPushButton;

src/lib_gui/qt/element/QtHelpButton.cpp

@@ -1,8 +1,8 @@
-#include "qt/element/QtHelpButton.h"
+#include "QtHelpButton.h"
 
 #include <QMessageBox>
 
-#include "utility/ResourcePaths.h"
+#include "ResourcePaths.h"
 
 QtHelpButton::QtHelpButton(const QString& helpTitle, const QString& helpText, QWidget* parent)
 	: QtIconButton(

src/lib_gui/qt/element/QtHelpButton.h

@@ -1,7 +1,7 @@
 #ifndef QT_HELP_BUTTON_H
 #define QT_HELP_BUTTON_H
 
-#include "qt/element/QtIconButton.h"
+#include "QtIconButton.h"
 
 class QtHelpButton
 	: public QtIconButton

src/lib_gui/qt/element/QtHistoryList.cpp

@@ -4,16 +4,16 @@
 #include <QLabel>
 #include <QScrollBar>
 
-#include "utility/messaging/type/history/MessageHistoryToPosition.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityString.h"
+#include "MessageHistoryToPosition.h"
+#include "ResourcePaths.h"
+#include "utilityString.h"
 
-#include "qt/utility/QtDeviceScaledPixmap.h"
-#include "qt/utility/utilityQt.h"
+#include "QtDeviceScaledPixmap.h"
+#include "utilityQt.h"
 
-#include "component/view/GraphViewStyle.h"
-#include "data/search/SearchMatch.h"
-#include "settings/ColorScheme.h"
+#include "GraphViewStyle.h"
+#include "SearchMatch.h"
+#include "ColorScheme.h"
 
 QtHistoryItem::QtHistoryItem(const SearchMatch& match, size_t index, bool isCurrent)
 	: index(index)

src/lib_gui/qt/element/QtIconButton.cpp

@@ -1,9 +1,9 @@
-#include "qt/element/QtIconButton.h"
+#include "QtIconButton.h"
 
 #include <QEvent>
 
-#include "qt/utility/utilityQt.h"
-#include "settings/ColorScheme.h"
+#include "utilityQt.h"
+#include "ColorScheme.h"
 
 
 QtHoverButton::QtHoverButton(QWidget* parent)

src/lib_gui/qt/element/QtIconButton.h

@@ -3,11 +3,11 @@
 
 #include <QPushButton>
 
-#include "utility/file/FilePath.h"
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageRefresh.h"
+#include "FilePath.h"
+#include "MessageListener.h"
+#include "MessageRefresh.h"
 
-#include "qt/utility/QtThreadedFunctor.h"
+#include "QtThreadedFunctor.h"
 
 class QtHoverButton
 	: public QPushButton

src/lib_gui/qt/element/QtLineEdit.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtLineEdit.h"
+#include "QtLineEdit.h"
 
 QtLineEdit::QtLineEdit(QWidget* parent)
 	: QLineEdit(parent)

src/lib_gui/qt/element/QtListBox.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtListBox.h"
+#include "QtListBox.h"
 
 #include <QBoxLayout>
 #include <QListWidget>
@@ -6,12 +6,12 @@
 #include <QListWidget>
 #include <QScrollBar>
 
-#include "qt/element/QtIconButton.h"
-#include "qt/element/QtStringListBoxItem.h"
-#include "qt/utility/utilityQt.h"
-#include "qt/window/QtTextEditDialog.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityString.h"
+#include "QtIconButton.h"
+#include "QtStringListBoxItem.h"
+#include "utilityQt.h"
+#include "QtTextEditDialog.h"
+#include "ResourcePaths.h"
+#include "utilityString.h"
 
 QtListBox::QtListBox(QWidget *parent, const QString& listName)
 	: QFrame(parent)

src/lib_gui/qt/element/QtListBox.h

@@ -3,7 +3,7 @@
 
 #include <QFrame>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class QEvent;
 class QHBoxLayout;

src/lib_gui/qt/element/QtListBoxItem.cpp

@@ -1,14 +1,14 @@
-#include "qt/element/QtListBoxItem.h"
+#include "QtListBoxItem.h"
 
 #include <QBoxLayout>
 #include <QListWidget>
 #include <QPushButton>
 
-#include "qt/element/QtLineEdit.h"
-#include "qt/element/QtListBox.h"
-#include "qt/element/QtIconButton.h"
-#include "qt/utility/QtFileDialog.h"
-#include "utility/ResourcePaths.h"
+#include "QtLineEdit.h"
+#include "QtListBox.h"
+#include "QtIconButton.h"
+#include "QtFileDialog.h"
+#include "ResourcePaths.h"
 
 QtListBoxItem::QtListBoxItem(QListWidgetItem* item, QWidget *parent)
 	: QWidget(parent)

src/lib_gui/qt/element/QtLocationPicker.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtLocationPicker.h"
+#include "QtLocationPicker.h"
 
 #include <QEvent>
 #include <QHBoxLayout>
@@ -6,10 +6,10 @@
 #include <QPainter>
 #include <QStyleOption>
 
-#include "qt/element/QtIconButton.h"
-#include "qt/utility/QtFileDialog.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityFile.h"
+#include "QtIconButton.h"
+#include "QtFileDialog.h"
+#include "ResourcePaths.h"
+#include "utilityFile.h"
 
 QtLocationPicker::QtLocationPicker(QWidget *parent)
 	: QWidget(parent)

src/lib_gui/qt/element/QtLocationPicker.h

@@ -3,8 +3,8 @@
 
 #include <QPushButton>
 
-#include "qt/element/QtLineEdit.h"
-#include "utility/file/FilePath.h"
+#include "QtLineEdit.h"
+#include "FilePath.h"
 
 class QtLocationPicker
 	: public QWidget

src/lib_gui/qt/element/QtPathListBox.cpp

@@ -1,12 +1,12 @@
-#include "qt/element/QtPathListBox.h"
+#include "QtPathListBox.h"
 
 #include <QtGui/qevent.h>
 #include <QLabel>
 #include <QListWidget>
 #include <QMimeData>
 
-#include "qt/element/QtPathListBoxItem.h"
-#include "utility/utilityFile.h"
+#include "QtPathListBoxItem.h"
+#include "utilityFile.h"
 
 QtPathListBox::QtPathListBox(QWidget *parent, const QString& listName, SelectionPolicyType selectionPolicy)
 	: QtListBox(parent, listName)

src/lib_gui/qt/element/QtPathListBox.h

@@ -1,7 +1,7 @@
 #ifndef QT_PATH_LIST_BOX_H
 #define QT_PATH_LIST_BOX_H
 
-#include "qt/element/QtListBox.h"
+#include "QtListBox.h"
 
 class QtPathListBox
 	: public QtListBox

src/lib_gui/qt/element/QtPathListBoxItem.cpp

@@ -1,14 +1,14 @@
-#include "qt/element/QtPathListBoxItem.h"
+#include "QtPathListBoxItem.h"
 
 #include <QBoxLayout>
 #include <QListWidget>
 #include <QPushButton>
 
-#include "qt/element/QtLineEdit.h"
-#include "qt/element/QtPathListBox.h"
-#include "qt/element/QtIconButton.h"
-#include "qt/utility/QtFileDialog.h"
-#include "utility/ResourcePaths.h"
+#include "QtLineEdit.h"
+#include "QtPathListBox.h"
+#include "QtIconButton.h"
+#include "QtFileDialog.h"
+#include "ResourcePaths.h"
 
 QtPathListBoxItem::QtPathListBoxItem(QtPathListBox* listBox, QListWidgetItem* item, QWidget *parent)
 	: QtListBoxItem(item, parent)

src/lib_gui/qt/element/QtPathListBoxItem.h

@@ -1,7 +1,7 @@
 #ifndef QT_PATH_LIST_BOX_ITEM_H
 #define QT_PATH_LIST_BOX_ITEM_H
 
-#include "qt/element/QtListBoxItem.h"
+#include "QtListBoxItem.h"
 
 class QPushButton;
 class QListWidgetItem;

src/lib_gui/qt/element/QtProgressBar.cpp

@@ -1,11 +1,11 @@
-#include "qt/element/QtProgressBar.h"
+#include "QtProgressBar.h"
 
 #include <QTimer>
 #include <QPainter>
 #include <QPaintEvent>
 #include <QPixmap>
 
-#include "utility/ResourcePaths.h"
+#include "ResourcePaths.h"
 
 QtProgressBar::QtProgressBar(QWidget* parent)
 	: QWidget(parent)

src/lib_gui/qt/element/QtProgressBar.h

@@ -3,8 +3,8 @@
 
 #include <QWidget>
 
-#include "qt/utility/QtDeviceScaledPixmap.h"
-#include "utility/TimeStamp.h"
+#include "QtDeviceScaledPixmap.h"
+#include "TimeStamp.h"
 
 class QTimer;
 

src/lib_gui/qt/element/QtScreenSearchBox.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtScreenSearchBox.h"
+#include "QtScreenSearchBox.h"
 
 #include <QApplication>
 #include <QCheckBox>
@@ -8,9 +8,9 @@
 #include <QPushButton>
 #include <QTimer>
 
-#include "qt/element/QtIconButton.h"
-#include "qt/utility/utilityQt.h"
-#include "utility/ResourcePaths.h"
+#include "QtIconButton.h"
+#include "utilityQt.h"
+#include "ResourcePaths.h"
 
 
 QtFocusInFilter::QtFocusInFilter(QObject* parent)

src/lib_gui/qt/element/QtScreenSearchBox.h

@@ -3,8 +3,8 @@
 
 #include <QFrame>
 
-#include "component/controller/helper/ControllerProxy.h"
-#include "component/controller/ScreenSearchController.h"
+#include "ControllerProxy.h"
+#include "ScreenSearchController.h"
 
 class QCheckBox;
 class QHBoxLayout;

src/lib_gui/qt/element/QtSearchBar.cpp

@@ -1,12 +1,12 @@
-#include "qt/element/QtSearchBar.h"
+#include "QtSearchBar.h"
 
 #include <QHBoxLayout>
 
-#include "utility/messaging/type/MessageActivateAll.h"
-#include "utility/ResourcePaths.h"
+#include "MessageActivateAll.h"
+#include "ResourcePaths.h"
 
-#include "qt/element/QtSearchBarButton.h"
-#include "qt/element/QtSmartSearchBox.h"
+#include "QtSearchBarButton.h"
+#include "QtSmartSearchBox.h"
 
 QtSearchBar::QtSearchBar()
 {

src/lib_gui/qt/element/QtSearchBar.h

@@ -6,7 +6,7 @@
 #include <QAbstractItemView>
 #include <QFrame>
 
-#include "data/search/SearchMatch.h"
+#include "SearchMatch.h"
 
 class QtSearchBarButton;
 class QtSmartSearchBox;

src/lib_gui/qt/element/QtSearchBarButton.cpp

@@ -1,6 +1,6 @@
-#include "qt/element/QtSearchBarButton.h"
+#include "QtSearchBarButton.h"
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 QtSearchBarButton::QtSearchBarButton(const FilePath& iconPath, bool small, QWidget* parent)
 	: QtSelfRefreshIconButton("", iconPath, "search/button", parent)

src/lib_gui/qt/element/QtSearchBarButton.h

@@ -1,7 +1,7 @@
 #ifndef QT_SEARCH_BAR_BUTTON_H
 #define QT_SEARCH_BAR_BUTTON_H
 
-#include "qt/element/QtIconButton.h"
+#include "QtIconButton.h"
 
 class QtSearchBarButton
 	: public QtSelfRefreshIconButton

src/lib_gui/qt/element/QtSmartSearchBox.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtSmartSearchBox.h"
+#include "QtSmartSearchBox.h"
 
 #include <stdlib.h>
 
@@ -6,14 +6,14 @@
 #include <QClipboard>
 #include <QKeyEvent>
 
-#include "component/view/GraphViewStyle.h"
-#include "data/NodeTypeSet.h"
-#include "settings/ColorScheme.h"
-#include "utility/messaging/type/MessageActivateFullTextSearch.h"
-#include "utility/messaging/type/MessageSearch.h"
-#include "utility/messaging/type/MessageSearchAutocomplete.h"
-#include "utility/utility.h"
-#include "utility/utilityString.h"
+#include "GraphViewStyle.h"
+#include "NodeTypeSet.h"
+#include "ColorScheme.h"
+#include "MessageActivateFullTextSearch.h"
+#include "MessageSearch.h"
+#include "MessageSearchAutocomplete.h"
+#include "utility.h"
+#include "utilityString.h"
 
 QtSearchElement::QtSearchElement(const QString& text, QWidget* parent)
 	: QPushButton(text, parent)

src/lib_gui/qt/element/QtSmartSearchBox.h

@@ -7,8 +7,8 @@
 #include <QLineEdit>
 #include <QPushButton>
 
-#include "data/search/SearchMatch.h"
-#include "qt/element/QtAutocompletionList.h"
+#include "SearchMatch.h"
+#include "QtAutocompletionList.h"
 
 class NodeTypeSet;
 

src/lib_gui/qt/element/QtStatusBar.cpp

@@ -1,14 +1,14 @@
-#include "qt/element/QtStatusBar.h"
+#include "QtStatusBar.h"
 
 #include <QHBoxLayout>
 #include <QMovie>
 #include <QProgressBar>
 
-#include "qt/utility/utilityQt.h"
-#include "utility/messaging/type/error/MessageErrorsAll.h"
-#include "utility/messaging/type/indexing/MessageIndexingShowDialog.h"
-#include "utility/messaging/type/MessageShowStatus.h"
-#include "utility/ResourcePaths.h"
+#include "utilityQt.h"
+#include "MessageErrorsAll.h"
+#include "MessageIndexingShowDialog.h"
+#include "MessageShowStatus.h"
+#include "ResourcePaths.h"
 
 QtStatusBar::QtStatusBar()
     : m_text(this)

src/lib_gui/qt/element/QtStatusBar.h

@@ -8,7 +8,7 @@
 #include <QLabel>
 #include <QStatusBar>
 
-#include "data/ErrorCountInfo.h"
+#include "ErrorCountInfo.h"
 
 class QProgressBar;
 

src/lib_gui/qt/element/QtStringListBox.cpp

@@ -1,8 +1,8 @@
-#include "qt/element/QtStringListBox.h"
+#include "QtStringListBox.h"
 
 #include <QListWidget>
 
-#include "qt/element/QtStringListBoxItem.h"
+#include "QtStringListBoxItem.h"
 
 QtStringListBox::QtStringListBox(QWidget *parent, const QString& listName)
 	: QtListBox(parent, listName)

src/lib_gui/qt/element/QtStringListBox.h

@@ -1,8 +1,8 @@
 #ifndef QT_STRING_LIST_BOX_H
 #define QT_STRING_LIST_BOX_H
 
-#include "qt/element/QtListBox.h"
-#include "qt/element/QtStringListBoxItem.h"
+#include "QtListBox.h"
+#include "QtStringListBoxItem.h"
 
 class QtStringListBox
 	: public QtListBox

src/lib_gui/qt/element/QtStringListBoxItem.cpp

@@ -1,6 +1,6 @@
-#include "qt/element/QtStringListBoxItem.h"
+#include "QtStringListBoxItem.h"
 
-#include "qt/element/QtStringListBox.h"
+#include "QtStringListBox.h"
 
 QtStringListBoxItem::QtStringListBoxItem(QtStringListBox* listBox, QListWidgetItem* item, QWidget *parent)
 	: QtListBoxItem(item, parent)

src/lib_gui/qt/element/QtStringListBoxItem.h

@@ -1,7 +1,7 @@
 #ifndef QT_STRING_LIST_BOX_ITEM_H
 #define QT_STRING_LIST_BOX_ITEM_H
 
-#include "qt/element/QtListBoxItem.h"
+#include "QtListBoxItem.h"
 
 class QListWidgetItem;
 

src/lib_gui/qt/element/QtTable.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtTable.h"
+#include "QtTable.h"
 
 #include <cmath>
 
@@ -8,7 +8,7 @@
 #include <QStyledItemDelegate>
 #include <QLineEdit>
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 
 class SelectableCellDelegate : public QStyledItemDelegate

src/lib_gui/qt/element/QtTooltip.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtTooltip.h"
+#include "QtTooltip.h"
 
 #include <QApplication>
 #include <QCursor>
@@ -8,11 +8,11 @@
 #include <QStyle>
 #include <QTimer>
 
-#include "data/location/SourceLocationFile.h"
-#include "data/tooltip/TooltipInfo.h"
-#include "qt/element/QtCodeField.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/TextCodec.h"
+#include "SourceLocationFile.h"
+#include "TooltipInfo.h"
+#include "QtCodeField.h"
+#include "ApplicationSettings.h"
+#include "TextCodec.h"
 
 QtTooltip::QtTooltip(QWidget* parent)
 	: QFrame(parent)

src/lib_gui/qt/element/QtUndoRedo.cpp

@@ -1,15 +1,15 @@
-#include "qt/element/QtUndoRedo.h"
+#include "QtUndoRedo.h"
 
 #include <QHBoxLayout>
 #include <QTimer>
 
-#include "utility/messaging/type/history/MessageHistoryUndo.h"
-#include "utility/messaging/type/history/MessageHistoryRedo.h"
-#include "utility/ResourcePaths.h"
+#include "MessageHistoryUndo.h"
+#include "MessageHistoryRedo.h"
+#include "ResourcePaths.h"
 
-#include "qt/element/QtHistoryList.h"
-#include "qt/element/QtSearchBarButton.h"
-#include "qt/utility/QtContextMenu.h"
+#include "QtHistoryList.h"
+#include "QtSearchBarButton.h"
+#include "QtContextMenu.h"
 
 QtUndoRedo::QtUndoRedo()
 	: m_pressed(false)

src/lib_gui/qt/element/QtUndoRedo.h

@@ -3,8 +3,8 @@
 
 #include <QFrame>
 
-#include "data/search/SearchMatch.h"
-#include "utility/TimeStamp.h"
+#include "SearchMatch.h"
+#include "TimeStamp.h"
 
 class QtSearchBarButton;
 class QtHistoryList;

src/lib_gui/qt/element/QtUpdateCheckerWidget.cpp

@@ -1,4 +1,4 @@
-#include "qt/element/QtUpdateCheckerWidget.h"
+#include "QtUpdateCheckerWidget.h"
 
 #include <QDesktopServices>
 #include <QHBoxLayout>
@@ -6,9 +6,9 @@
 #include <QTimer>
 #include <QUrl>
 
-#include "qt/network/QtUpdateChecker.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/TimeStamp.h"
+#include "QtUpdateChecker.h"
+#include "ApplicationSettings.h"
+#include "TimeStamp.h"
 
 QtUpdateCheckerWidget::QtUpdateCheckerWidget(QWidget* parent)
 	: QWidget(parent)

src/lib_gui/qt/graphics/QtCountCircleItem.cpp

@@ -1,10 +1,10 @@
-#include "qt/graphics/QtCountCircleItem.h"
+#include "QtCountCircleItem.h"
 
 #include <QFont>
 #include <QFontMetrics>
 #include <QPen>
 
-#include "component/view/GraphViewStyle.h"
+#include "GraphViewStyle.h"
 
 QtCountCircleItem::QtCountCircleItem(QGraphicsItem* parent)
 	: QtRoundedRectItem(parent)

src/lib_gui/qt/graphics/QtCountCircleItem.h

@@ -1,9 +1,9 @@
 #ifndef QT_COUNT_CIRCLE_ITEM_H
 #define QT_COUNT_CIRCLE_ITEM_H
 
-#include "utility/math/Vector2.h"
+#include "Vector2.h"
 
-#include "qt/graphics/QtRoundedRectItem.h"
+#include "QtRoundedRectItem.h"
 
 class QtCountCircleItem
 	: public QtRoundedRectItem

src/lib_gui/qt/graphics/QtGraphicsView.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtGraphicsView.h"
+#include "QtGraphicsView.h"
 
 #include <QDir>
 #include <QMouseEvent>
@@ -11,23 +11,23 @@
 #include <QParallelAnimationGroup>
 #include <QSvgGenerator>
 
-#include "qt/element/QtIconButton.h"
-#include "qt/view/graphElements/QtGraphEdge.h"
-#include "qt/view/graphElements/QtGraphNode.h"
-#include "qt/view/graphElements/QtGraphNodeBundle.h"
-#include "qt/view/graphElements/QtGraphNodeData.h"
-#include "qt/view/graphElements/QtGraphNodeExpandToggle.h"
-#include "qt/utility/QtContextMenu.h"
-#include "qt/utility/QtFileDialog.h"
-#include "qt/utility/utilityQt.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/messaging/type/activation/MessageActivateLegend.h"
-#include "utility/messaging/type/code/MessageCodeShowDefinition.h"
-#include "utility/messaging/type/MessageDisplayBookmarkCreator.h"
-#include "utility/messaging/type/MessageGraphNodeExpand.h"
-#include "utility/messaging/type/MessageGraphNodeHide.h"
-#include "utility/ResourcePaths.h"
-#include "utility/utilityApp.h"
+#include "QtIconButton.h"
+#include "QtGraphEdge.h"
+#include "QtGraphNode.h"
+#include "QtGraphNodeBundle.h"
+#include "QtGraphNodeData.h"
+#include "QtGraphNodeExpandToggle.h"
+#include "QtContextMenu.h"
+#include "QtFileDialog.h"
+#include "utilityQt.h"
+#include "ApplicationSettings.h"
+#include "MessageActivateLegend.h"
+#include "MessageCodeShowDefinition.h"
+#include "MessageDisplayBookmarkCreator.h"
+#include "MessageGraphNodeExpand.h"
+#include "MessageGraphNodeHide.h"
+#include "ResourcePaths.h"
+#include "utilityApp.h"
 
 QtGraphicsView::QtGraphicsView(QWidget* parent)
 	: QGraphicsView(parent)

src/lib_gui/qt/graphics/QtGraphicsView.h

@@ -5,7 +5,7 @@
 
 #include <QGraphicsView>
 
-#include "utility/types.h"
+#include "types.h"
 
 class QPushButton;
 class QTimer;

src/lib_gui/qt/graphics/QtLineItemAngled.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtLineItemAngled.h"
+#include "QtLineItemAngled.h"
 
 #include <cmath>
 

src/lib_gui/qt/graphics/QtLineItemAngled.h

@@ -1,7 +1,7 @@
 #ifndef QT_LINE_ITEM_ANGLED_H
 #define QT_LINE_ITEM_ANGLED_H
 
-#include "qt/graphics/QtLineItemBase.h"
+#include "QtLineItemBase.h"
 
 class QtLineItemAngled
 	: public QtLineItemBase

src/lib_gui/qt/graphics/QtLineItemBase.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtLineItemBase.h"
+#include "QtLineItemBase.h"
 
 #include <QBrush>
 #include <QPen>

src/lib_gui/qt/graphics/QtLineItemBase.h

@@ -3,9 +3,9 @@
 
 #include <QGraphicsItem>
 
-#include "utility/math/Vector4.h"
+#include "Vector4.h"
 
-#include "component/view/GraphViewStyle.h"
+#include "GraphViewStyle.h"
 
 class QtLineItemBase
 	: public QGraphicsLineItem

src/lib_gui/qt/graphics/QtLineItemBezier.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtLineItemBezier.h"
+#include "QtLineItemBezier.h"
 
 #include <QPainter>
 

src/lib_gui/qt/graphics/QtLineItemBezier.h

@@ -1,7 +1,7 @@
 #ifndef QT_LINE_ITEM_BEZIER_H
 #define QT_LINE_ITEM_BEZIER_H
 
-#include "qt/graphics/QtLineItemBase.h"
+#include "QtLineItemBase.h"
 
 class QtLineItemBezier
 	: public QtLineItemBase

src/lib_gui/qt/graphics/QtLineItemStraight.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtLineItemStraight.h"
+#include "QtLineItemStraight.h"
 
 #include <QBrush>
 #include <QPen>

src/lib_gui/qt/graphics/QtLineItemStraight.h

@@ -3,7 +3,7 @@
 
 #include <QGraphicsItem>
 
-#include "component/view/GraphViewStyle.h"
+#include "GraphViewStyle.h"
 
 class QtLineItemStraight
 	: public QGraphicsLineItem

src/lib_gui/qt/graphics/QtRoundedRectItem.cpp

@@ -1,4 +1,4 @@
-#include "qt/graphics/QtRoundedRectItem.h"
+#include "QtRoundedRectItem.h"
 
 #include <QGraphicsDropShadowEffect>
 #include <QPainter>

src/lib_gui/qt/network/QtIDECommunicationController.cpp

@@ -2,7 +2,7 @@
 
 #include <functional>
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 QtIDECommunicationController::QtIDECommunicationController(QObject* parent, StorageAccess* storageAccess)
 	: IDECommunicationController(storageAccess)

src/lib_gui/qt/network/QtIDECommunicationController.h

@@ -5,8 +5,8 @@
 
 #include "QtTcpWrapper.h"
 
-#include "component/controller/IDECommunicationController.h"
-#include "qt/utility/QtThreadedFunctor.h"
+#include "IDECommunicationController.h"
+#include "QtThreadedFunctor.h"
 
 class StorageAccess;
 

src/lib_gui/qt/network/QtNetworkFactory.h

@@ -1,7 +1,7 @@
 #ifndef QT_NETWORK_FACTORY_H
 #define QT_NETWORK_FACTORY_H
 
-#include "component/NetworkFactory.h"
+#include "NetworkFactory.h"
 
 class QtNetworkFactory
 	: public NetworkFactory

src/lib_gui/qt/network/QtRequest.cpp

@@ -1,9 +1,9 @@
-#include "qt/network/QtRequest.h"
+#include "QtRequest.h"
 
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 
-#include "utility/logging/logging.h"
+#include "logging.h"
 
 QtRequest::QtRequest()
 {

src/lib_gui/qt/network/QtTcpWrapper.cpp

@@ -1,7 +1,7 @@
 #include "QtTcpWrapper.h"
 #include "qdatastream.h"
 
-#include "utility/logging/logging.h"
+#include "logging.h"
 
 QtTcpWrapper::QtTcpWrapper(QObject* parent, const std::string& ip, const quint16 serverPort, const quint16 clientPort)
 	: QObject(parent)

src/lib_gui/qt/network/QtUpdateChecker.cpp

@@ -1,4 +1,4 @@
-#include "qt/network/QtUpdateChecker.h"
+#include "QtUpdateChecker.h"
 
 #include <QDesktopServices>
 #include <QMessageBox>
@@ -7,12 +7,12 @@
 #include <QUrl>
 
 #include "LicenseChecker.h"
-#include "qt/network/QtRequest.h"
-#include "settings/ApplicationSettings.h"
-#include "utility/Version.h"
-#include "utility/utility.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityUuid.h"
+#include "QtRequest.h"
+#include "ApplicationSettings.h"
+#include "Version.h"
+#include "utility.h"
+#include "utilityApp.h"
+#include "utilityUuid.h"
 
 bool QtUpdateChecker::needsAutomaticCheck()
 {

src/lib_gui/qt/network/QtUpdateChecker.h

@@ -1,9 +1,9 @@
 #ifndef QT_UPDATE_CHECKER_H
 #define QT_UPDATE_CHECKER_H
 
-#include "qt/utility/QtThreadedFunctor.h"
+#include "QtThreadedFunctor.h"
 #include "UpdateChecker.h"
-#include "utility/Version.h"
+#include "Version.h"
 
 class QtUpdateChecker
 	: public UpdateChecker

src/lib_gui/qt/utility/QtContextMenu.cpp

@@ -1,4 +1,4 @@
-#include "qt/utility/QtContextMenu.h"
+#include "QtContextMenu.h"
 
 #include <QApplication>
 #include <QClipboard>
@@ -6,9 +6,9 @@
 #include <QDesktopServices>
 #include <QUrl>
 
-#include "utility/logging/logging.h"
-#include "utility/messaging/type/history/MessageHistoryRedo.h"
-#include "utility/messaging/type/history/MessageHistoryUndo.h"
+#include "logging.h"
+#include "MessageHistoryRedo.h"
+#include "MessageHistoryUndo.h"
 
 QtContextMenu* QtContextMenu::s_instance;
 

src/lib_gui/qt/utility/QtContextMenu.h

@@ -6,7 +6,7 @@
 #include <QMenu>
 #include <QObject>
 
-#include "utility/file/FilePath.h"
+#include "FilePath.h"
 
 class QtContextMenu
 	: public QObject

src/lib_gui/qt/utility/QtDeviceScaledPixmap.cpp

@@ -1,8 +1,8 @@
-#include "qt/utility/QtDeviceScaledPixmap.h"
+#include "QtDeviceScaledPixmap.h"
 
 #include <QApplication>
 
-#include "qt/utility/utilityQt.h"
+#include "utilityQt.h"
 
 qreal QtDeviceScaledPixmap::devicePixelRatio()
 {

src/lib_gui/qt/utility/QtFileDialog.cpp

@@ -1,12 +1,12 @@
-#include "qt/utility/QtFileDialog.h"
+#include "QtFileDialog.h"
 
 #include <QFileDialog>
 #include <QListView>
 #include <QTreeView>
 
-#include "qt/utility/QtFilesAndDirectoriesDialog.h"
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
+#include "QtFilesAndDirectoriesDialog.h"
+#include "FilePath.h"
+#include "utilityApp.h"
 
 QStringList QtFileDialog::getFileNamesAndDirectories(QWidget* parent, const FilePath& path)
 {

src/lib_gui/qt/utility/QtFilesAndDirectoriesDialog.cpp

@@ -1,11 +1,11 @@
-#include "qt/utility/QtFilesAndDirectoriesDialog.h"
+#include "QtFilesAndDirectoriesDialog.h"
 
 #include <QListView>
 #include <QPushButton>
 #include <QEvent>
 
-#include "utility/file/FilePath.h"
-#include "utility/utilityApp.h"
+#include "FilePath.h"
+#include "utilityApp.h"
 
 QtFilesAndDirectoriesDialog::QtFilesAndDirectoriesDialog(QWidget* parent)
 	: QFileDialog(parent)

src/lib_gui/qt/utility/QtFlowLayout.cpp

@@ -1,6 +1,6 @@
 // from: http://doc.qt.io/qt-5/qtwidgets-layouts-flowlayout-flowlayout-cpp.html
 
-#include "qt/utility/QtFlowLayout.h"
+#include "QtFlowLayout.h"
 
 #include <QWidget>
 

src/lib_gui/qt/utility/QtHighlighter.cpp

@@ -1,12 +1,12 @@
-#include "qt/utility/QtHighlighter.h"
+#include "QtHighlighter.h"
 
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTextDocument>
 
-#include "settings/ColorScheme.h"
-#include "utility/tracing.h"
-#include "utility/utility.h"
+#include "ColorScheme.h"
+#include "tracing.h"
+#include "utility.h"
 
 QVector<QtHighlighter::HighlightingRule> QtHighlighter::s_highlightingRules;
 QVector<QtHighlighter::HighlightingRule> QtHighlighter::s_highlightingRulesCpp;

src/lib_gui/qt/utility/QtHighlighter.h

@@ -3,7 +3,7 @@
 
 #include <QTextCharFormat>
 
-#include "settings/LanguageType.h"
+#include "LanguageType.h"
 
 class QTextBlock;
 class QTextDocument;

src/lib_gui/qt/utility/QtScrollSpeedChangeListener.cpp

@@ -1,10 +1,10 @@
-#include "qt/utility/QtScrollSpeedChangeListener.h"
+#include "QtScrollSpeedChangeListener.h"
 
 #include <cmath>
 
 #include <QScrollBar>
 
-#include "settings/ApplicationSettings.h"
+#include "ApplicationSettings.h"
 
 QtScrollSpeedChangeListener::QtScrollSpeedChangeListener()
 	: m_changeScrollSpeedFunctor(std::bind(&QtScrollSpeedChangeListener::doChangeScrollSpeed, this, std::placeholders::_1))

src/lib_gui/qt/utility/QtScrollSpeedChangeListener.h

@@ -1,10 +1,10 @@
 #ifndef QT_SCROLL_SPEED_CHANGE_LISTENER
 #define QT_SCROLL_SPEED_CHANGE_LISTENER
 
-#include "utility/messaging/MessageListener.h"
-#include "utility/messaging/type/MessageScrollSpeedChange.h"
+#include "MessageListener.h"
+#include "MessageScrollSpeedChange.h"
 
-#include "qt/utility/QtThreadedFunctor.h"
+#include "QtThreadedFunctor.h"
 
 class QScrollBar;