summaryrefslogtreecommitdiffhomepage
path: root/options
diff options
context:
space:
mode:
Diffstat (limited to 'options')
-rw-r--r--options/base-value.hpp1
-rw-r--r--options/bundle.hpp1
-rw-r--r--options/connector.cpp1
-rw-r--r--options/group.cpp2
-rw-r--r--options/group.hpp2
-rw-r--r--options/options.hpp2
-rw-r--r--options/slider.hpp3
-rw-r--r--options/tie.cpp1
-rw-r--r--options/tie.hpp1
-rw-r--r--options/value.hpp3
10 files changed, 6 insertions, 11 deletions
diff --git a/options/base-value.hpp b/options/base-value.hpp
index aabced2a..b094d693 100644
--- a/options/base-value.hpp
+++ b/options/base-value.hpp
@@ -5,6 +5,7 @@
#include "connector.hpp"
#include "export.hpp"
+#include "compat/meta.hpp"
#include <QObject>
#include <QString>
diff --git a/options/bundle.hpp b/options/bundle.hpp
index b6189ba6..9b7b7f02 100644
--- a/options/bundle.hpp
+++ b/options/bundle.hpp
@@ -25,7 +25,6 @@
#include <QDebug>
-#include "compat/util.hpp"
#include "export.hpp"
namespace options {
diff --git a/options/connector.cpp b/options/connector.cpp
index 075a57e1..6031d9ed 100644
--- a/options/connector.cpp
+++ b/options/connector.cpp
@@ -6,7 +6,6 @@
* notice appear in all copies.
*/
-#include "compat/util.hpp"
#include "connector.hpp"
#include "value.hpp"
diff --git a/options/group.cpp b/options/group.cpp
index 2d5588a1..69378d51 100644
--- a/options/group.cpp
+++ b/options/group.cpp
@@ -10,7 +10,7 @@
#include "defs.hpp"
#include "compat/timer.hpp"
-#include "opentrack-library-path.h"
+#include "compat/library-path.hpp"
#include <cmath>
diff --git a/options/group.hpp b/options/group.hpp
index 0f806f75..c933b134 100644
--- a/options/group.hpp
+++ b/options/group.hpp
@@ -2,8 +2,6 @@
#include "export.hpp"
-#include "compat/util.hpp"
-
// included here to propagate into callers of options::group
#include "metatype.hpp"
diff --git a/options/options.hpp b/options/options.hpp
index 45697597..bc892120 100644
--- a/options/options.hpp
+++ b/options/options.hpp
@@ -6,8 +6,6 @@
*/
#pragma once
-#include "compat/util.hpp"
-
#include "defs.hpp"
#include "bundle.hpp"
#include "group.hpp"
diff --git a/options/slider.hpp b/options/slider.hpp
index 5657ab82..f3ba44f8 100644
--- a/options/slider.hpp
+++ b/options/slider.hpp
@@ -8,8 +8,7 @@
#pragma once
#include "export.hpp"
-
-#include "compat/util.hpp"
+#include "compat/macros.hpp"
#include <QMetaType>
#include <QDataStream>
diff --git a/options/tie.cpp b/options/tie.cpp
index 9e693f5c..baa8bb82 100644
--- a/options/tie.cpp
+++ b/options/tie.cpp
@@ -7,6 +7,7 @@
*/
#include "tie.hpp"
+#include "compat/run-in-thread.hpp"
namespace options {
diff --git a/options/tie.hpp b/options/tie.hpp
index 8d5fe6c5..4ebc1846 100644
--- a/options/tie.hpp
+++ b/options/tie.hpp
@@ -10,6 +10,7 @@
#include "export.hpp"
#include "value.hpp"
+#include "compat/run-in-thread.hpp"
#include <QComboBox>
#include <QCheckBox>
diff --git a/options/value.hpp b/options/value.hpp
index 1da1dd9c..87bb2a85 100644
--- a/options/value.hpp
+++ b/options/value.hpp
@@ -10,12 +10,11 @@
#include "export.hpp"
-#include "compat/util.hpp"
-
#include "bundle.hpp"
#include "slider.hpp"
#include "base-value.hpp"
#include "value-traits.hpp"
+#include "compat/macros.hpp"
#include <cstdio>
#include <type_traits>