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

src/lib_gui/qt/utility/QtThreadedFunctor.h

@@ -8,8 +8,8 @@
 #include <QObject>
 #include <QSemaphore>
 
-#include "utility/messaging/type/MessageWindowClosed.h"
-#include "utility/messaging/MessageListener.h"
+#include "MessageWindowClosed.h"
+#include "MessageListener.h"
 
 class QtThreadedFunctorHelper: public QObject, public MessageListener<MessageWindowClosed>
 {

src/lib_gui/qt/utility/QtWindowsTaskbarButton.cpp

@@ -1,11 +1,11 @@
-#include "qt/utility/QtWindowsTaskbarButton.h"
+#include "QtWindowsTaskbarButton.h"
 
 #ifdef _WIN32
 #include <QWinTaskbarButton>
 #include <QWinTaskbarProgress>
 #endif
 
-#include "qt/window/QtMainWindow.h"
+#include "QtMainWindow.h"
 
 QtWindowsTaskbarButton::QtWindowsTaskbarButton()
 #ifdef _WIN32

src/lib_gui/qt/utility/utilityQt.cpp

@@ -1,4 +1,4 @@
-#include "qt/utility/utilityQt.h"
+#include "utilityQt.h"
 
 #include <set>
 
@@ -9,16 +9,16 @@
 #include <QPainter>
 #include <QWidget>
 
-#include "utility/file/FilePath.h"
-#include "utility/file/FileSystem.h"
-#include "utility/logging/logging.h"
-#include "utility/ResourcePaths.h"
-#include "utility/text/TextAccess.h"
-#include "utility/utilityApp.h"
-#include "utility/utilityString.h"
+#include "FilePath.h"
+#include "FileSystem.h"
+#include "logging.h"
+#include "ResourcePaths.h"
+#include "TextAccess.h"
+#include "utilityApp.h"
+#include "utilityString.h"
 
-#include "settings/ApplicationSettings.h"
-#include "settings/ColorScheme.h"
+#include "ApplicationSettings.h"
+#include "ColorScheme.h"
 
 namespace utility
 {