summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-07 11:24:40 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-07 11:54:26 +0200
commit511e095fa3b944b2016560e6bb21e3f0413aa1a4 (patch)
tree6d645cfec7f5b6bbfe80d2c5a232a93a0b96213d
parent71b9202dbd592996478cb3ab67a84c23fd98368e (diff)
includes relative to project top directory
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.h2
-rw-r--r--opentrack/mappings.hpp2
-rw-r--r--opentrack/tracker.h2
-rw-r--r--qfunctionconfigurator/functionconfig.h2
-rw-r--r--qfunctionconfigurator/qfunctionconfigurator.cpp2
5 files changed, 5 insertions, 5 deletions
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index ade6ac75..3fe9952d 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -38,7 +38,7 @@
#include <QMutexLocker>
#include "compat/compat.h"
#include "opentrack/options.hpp"
-#include "../freetrackclient/fttypes.h"
+#include "freetrackclient/fttypes.h"
using namespace options;
struct settings : opts {
diff --git a/opentrack/mappings.hpp b/opentrack/mappings.hpp
index 650e6f99..85d9900c 100644
--- a/opentrack/mappings.hpp
+++ b/opentrack/mappings.hpp
@@ -10,7 +10,7 @@
#include <QSettings>
#include "options.hpp"
using namespace options;
-#include "../qfunctionconfigurator/functionconfig.h"
+#include "qfunctionconfigurator/functionconfig.h"
#include "main-settings.hpp"
class Mapping {
diff --git a/opentrack/tracker.h b/opentrack/tracker.h
index 8aeaf1c5..453357c4 100644
--- a/opentrack/tracker.h
+++ b/opentrack/tracker.h
@@ -17,7 +17,7 @@
#include "simple-mat.hpp"
#include "selected-libraries.hpp"
-#include "../qfunctionconfigurator/functionconfig.h"
+#include "qfunctionconfigurator/functionconfig.h"
#include "main-settings.hpp"
#include "options.hpp"
diff --git a/qfunctionconfigurator/functionconfig.h b/qfunctionconfigurator/functionconfig.h
index 4ce5efee..bd8be140 100644
--- a/qfunctionconfigurator/functionconfig.h
+++ b/qfunctionconfigurator/functionconfig.h
@@ -14,7 +14,7 @@
#include <QSettings>
#include <QMutex>
#include <vector>
-#include "../opentrack/qcopyable-mutex.hpp"
+#include "opentrack/qcopyable-mutex.hpp"
class Map {
private:
diff --git a/qfunctionconfigurator/qfunctionconfigurator.cpp b/qfunctionconfigurator/qfunctionconfigurator.cpp
index e1c40396..11eb8a71 100644
--- a/qfunctionconfigurator/qfunctionconfigurator.cpp
+++ b/qfunctionconfigurator/qfunctionconfigurator.cpp
@@ -1,4 +1,4 @@
-#include "../opentrack/options.hpp"
+#include "opentrack/options.hpp"
using namespace options;
#include "qfunctionconfigurator/qfunctionconfigurator.h"
#include <QPainter>