summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xCMakeLists.txt2
-rw-r--r--filter-accela/CMakeLists.txt2
-rw-r--r--filter-accela/accela-settings.hpp2
-rw-r--r--filter-accela/ftnoir_filter_accela_dialog.cpp2
-rw-r--r--gui/CMakeLists.txt2
-rw-r--r--gui/mapping-window.cpp2
-rw-r--r--gui/mapping-window.ui2
-rw-r--r--logic/CMakeLists.txt2
-rw-r--r--logic/mappings.hpp2
-rw-r--r--logic/tracker.h2
-rw-r--r--migration/CMakeLists.txt2
-rw-r--r--spline-widget/CMakeLists.txt2
-rw-r--r--spline/CMakeLists.txt2
-rw-r--r--spline/broken/qfunctionconfiguratorplugin.cpp (renamed from spline-widget/broken/qfunctionconfiguratorplugin.cpp)0
-rw-r--r--spline/broken/qfunctionconfiguratorplugin.h (renamed from spline-widget/broken/qfunctionconfiguratorplugin.h)0
-rw-r--r--spline/export.hpp (renamed from spline-widget/export.hpp)0
-rw-r--r--spline/lang/nl_NL.ts (renamed from spline-widget/lang/nl_NL.ts)0
-rw-r--r--spline/lang/ru_RU.ts (renamed from spline-widget/lang/ru_RU.ts)0
-rw-r--r--spline/lang/stub.ts (renamed from spline-widget/lang/stub.ts)0
-rw-r--r--spline/spline-widget.cpp (renamed from spline-widget/spline-widget.cpp)0
-rw-r--r--spline/spline-widget.hpp (renamed from spline-widget/spline-widget.hpp)0
-rw-r--r--spline/spline.cpp (renamed from spline-widget/spline.cpp)0
-rw-r--r--spline/spline.hpp (renamed from spline-widget/spline.hpp)0
-rw-r--r--tracker-tobii-eyex/CMakeLists.txt6
-rw-r--r--tracker-tobii-eyex/tobii-eyex-dialog.ui2
-rw-r--r--tracker-tobii-eyex/tobii-settings.hpp4
26 files changed, 19 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f519ebb..074e4011 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,7 +62,7 @@ file(GLOB opentrack-subprojects
"x-plane-plugin/${C}"
"csv/${C}"
"pose-widget/${C}"
- "spline-widget/${C}"
+ "spline/${C}"
"qxt-mini/${C}"
"macosx/${C}"
"cv/${C}"
diff --git a/filter-accela/CMakeLists.txt b/filter-accela/CMakeLists.txt
index 61286764..ef6424eb 100644
--- a/filter-accela/CMakeLists.txt
+++ b/filter-accela/CMakeLists.txt
@@ -1,2 +1,2 @@
otr_module(filter-accela)
-target_link_libraries(opentrack-filter-accela opentrack-spline-widget)
+target_link_libraries(opentrack-filter-accela opentrack-spline)
diff --git a/filter-accela/accela-settings.hpp b/filter-accela/accela-settings.hpp
index 008fc797..6b264f2e 100644
--- a/filter-accela/accela-settings.hpp
+++ b/filter-accela/accela-settings.hpp
@@ -2,7 +2,7 @@
#include "options/options.hpp"
using namespace options;
-#include "spline-widget/spline.hpp"
+#include "spline/spline.hpp"
struct settings_accela : opts
{
diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp
index 51789f61..637bee86 100644
--- a/filter-accela/ftnoir_filter_accela_dialog.cpp
+++ b/filter-accela/ftnoir_filter_accela_dialog.cpp
@@ -10,7 +10,7 @@
#include <algorithm>
#include <QDoubleSpinBox>
#include "api/plugin-api.hpp"
-#include "spline-widget/spline-widget.hpp"
+#include "spline/spline-widget.hpp"
#include <QDialog>
dialog_accela::dialog_accela()
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 25181fce..3cd17e24 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -20,7 +20,7 @@ set_target_properties(opentrack-user-interface PROPERTIES
target_link_libraries(opentrack-user-interface
opentrack-migration
opentrack-logic
- opentrack-spline-widget
+ opentrack-spline
opentrack-pose-widget
opentrack-version
)
diff --git a/gui/mapping-window.cpp b/gui/mapping-window.cpp
index 007e3217..5f61d31f 100644
--- a/gui/mapping-window.cpp
+++ b/gui/mapping-window.cpp
@@ -8,7 +8,7 @@
#include "mapping-window.hpp"
#include "logic/main-settings.hpp"
-#include "spline-widget/spline-widget.hpp"
+#include "spline/spline-widget.hpp"
MapWidget::MapWidget(Mappings& m) : m(m)
{
diff --git a/gui/mapping-window.ui b/gui/mapping-window.ui
index 14628be3..4ef77cb8 100644
--- a/gui/mapping-window.ui
+++ b/gui/mapping-window.ui
@@ -588,7 +588,7 @@
<customwidget>
<class>spline_widget</class>
<extends>QWidget</extends>
- <header>spline-widget/spline-widget.hpp</header>
+ <header>spline/spline-widget.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt
index ddbb9509..f3f128af 100644
--- a/logic/CMakeLists.txt
+++ b/logic/CMakeLists.txt
@@ -1,5 +1,5 @@
otr_module(logic BIN)
-target_link_libraries(opentrack-logic opentrack-spline-widget)
+target_link_libraries(opentrack-logic opentrack-spline)
if(NOT WIN32)
target_link_libraries(opentrack-logic opentrack-qxt-mini)
else()
diff --git a/logic/mappings.hpp b/logic/mappings.hpp
index fdbac460..6d028c10 100644
--- a/logic/mappings.hpp
+++ b/logic/mappings.hpp
@@ -10,7 +10,7 @@
#include "export.hpp"
#include "options/options.hpp"
using namespace options;
-#include "spline-widget/spline.hpp"
+#include "spline/spline.hpp"
#include "main-settings.hpp"
struct OPENTRACK_LOGIC_EXPORT Map final
diff --git a/logic/tracker.h b/logic/tracker.h
index 6ba5dc70..6b9b07ee 100644
--- a/logic/tracker.h
+++ b/logic/tracker.h
@@ -16,7 +16,7 @@
#include "compat/euler.hpp"
#include "selected-libraries.hpp"
-#include "spline-widget/spline.hpp"
+#include "spline/spline.hpp"
#include "main-settings.hpp"
#include "options/options.hpp"
#include "tracklogger.hpp"
diff --git a/migration/CMakeLists.txt b/migration/CMakeLists.txt
index ff4dfae2..9a7f7dc9 100644
--- a/migration/CMakeLists.txt
+++ b/migration/CMakeLists.txt
@@ -1,2 +1,2 @@
otr_module(migration BIN)
-target_link_libraries(opentrack-migration opentrack-logic opentrack-spline-widget)
+target_link_libraries(opentrack-migration opentrack-logic opentrack-spline)
diff --git a/spline-widget/CMakeLists.txt b/spline-widget/CMakeLists.txt
deleted file mode 100644
index 5cc25ab8..00000000
--- a/spline-widget/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-otr_module(spline-widget NO-COMPAT BIN)
-target_link_libraries(opentrack-spline-widget opentrack-options opentrack-compat)
diff --git a/spline/CMakeLists.txt b/spline/CMakeLists.txt
new file mode 100644
index 00000000..d252004b
--- /dev/null
+++ b/spline/CMakeLists.txt
@@ -0,0 +1,2 @@
+otr_module(spline NO-COMPAT BIN)
+target_link_libraries(opentrack-spline opentrack-options opentrack-compat)
diff --git a/spline-widget/broken/qfunctionconfiguratorplugin.cpp b/spline/broken/qfunctionconfiguratorplugin.cpp
index 1a9da10a..1a9da10a 100644
--- a/spline-widget/broken/qfunctionconfiguratorplugin.cpp
+++ b/spline/broken/qfunctionconfiguratorplugin.cpp
diff --git a/spline-widget/broken/qfunctionconfiguratorplugin.h b/spline/broken/qfunctionconfiguratorplugin.h
index ca68e0e2..ca68e0e2 100644
--- a/spline-widget/broken/qfunctionconfiguratorplugin.h
+++ b/spline/broken/qfunctionconfiguratorplugin.h
diff --git a/spline-widget/export.hpp b/spline/export.hpp
index 4875b4c1..4875b4c1 100644
--- a/spline-widget/export.hpp
+++ b/spline/export.hpp
diff --git a/spline-widget/lang/nl_NL.ts b/spline/lang/nl_NL.ts
index 9e739505..9e739505 100644
--- a/spline-widget/lang/nl_NL.ts
+++ b/spline/lang/nl_NL.ts
diff --git a/spline-widget/lang/ru_RU.ts b/spline/lang/ru_RU.ts
index f62cf2e1..f62cf2e1 100644
--- a/spline-widget/lang/ru_RU.ts
+++ b/spline/lang/ru_RU.ts
diff --git a/spline-widget/lang/stub.ts b/spline/lang/stub.ts
index 6401616d..6401616d 100644
--- a/spline-widget/lang/stub.ts
+++ b/spline/lang/stub.ts
diff --git a/spline-widget/spline-widget.cpp b/spline/spline-widget.cpp
index c7dd5e5a..c7dd5e5a 100644
--- a/spline-widget/spline-widget.cpp
+++ b/spline/spline-widget.cpp
diff --git a/spline-widget/spline-widget.hpp b/spline/spline-widget.hpp
index 4d5a7680..4d5a7680 100644
--- a/spline-widget/spline-widget.hpp
+++ b/spline/spline-widget.hpp
diff --git a/spline-widget/spline.cpp b/spline/spline.cpp
index 2db23c14..2db23c14 100644
--- a/spline-widget/spline.cpp
+++ b/spline/spline.cpp
diff --git a/spline-widget/spline.hpp b/spline/spline.hpp
index 77b2bdf9..77b2bdf9 100644
--- a/spline-widget/spline.hpp
+++ b/spline/spline.hpp
diff --git a/tracker-tobii-eyex/CMakeLists.txt b/tracker-tobii-eyex/CMakeLists.txt
index 66fa90ae..31125e1a 100644
--- a/tracker-tobii-eyex/CMakeLists.txt
+++ b/tracker-tobii-eyex/CMakeLists.txt
@@ -3,13 +3,13 @@ if(WIN32)
if(SDK_TOBII_EYEX)
set(porked NO-INSTALL)
otr_module(tracker-tobii-eyex ${porked})
- target_link_libraries(opentrack-tracker-tobii-eyex opentrack-spline-widget)
+ target_link_libraries(opentrack-tracker-tobii-eyex opentrack-spline)
set(tobii-libdir ${SDK_TOBII_EYEX}/lib/x86/)
set(tobii-dll ${tobii-libdir}/Tobii.EyeX.Client.dll)
# we only care about the .lib for MSVC++ build anyway
set(tobii-link ${tobii-libdir}/Tobii.EyeX.Client.lib)
- target_include_directories(opentrack-tracker-tobii-eyex PRIVATE ${CMAKE_SOURCE_DIR}/spline-widget)
- target_link_libraries(opentrack-tracker-tobii-eyex ${tobii-link} opentrack-spline-widget)
+ target_include_directories(opentrack-tracker-tobii-eyex PRIVATE ${CMAKE_SOURCE_DIR}/spline)
+ target_link_libraries(opentrack-tracker-tobii-eyex ${tobii-link} opentrack-spline)
# we only ever use the C headers due to Microsoft CRT ABI incompatibility with GNU
set(tobii-incdir ${SDK_TOBII_EYEX}/include/eyex)
target_include_directories(opentrack-tracker-tobii-eyex SYSTEM PUBLIC ${tobii-incdir})
diff --git a/tracker-tobii-eyex/tobii-eyex-dialog.ui b/tracker-tobii-eyex/tobii-eyex-dialog.ui
index b6138514..f32c91f4 100644
--- a/tracker-tobii-eyex/tobii-eyex-dialog.ui
+++ b/tracker-tobii-eyex/tobii-eyex-dialog.ui
@@ -537,7 +537,7 @@
<customwidget>
<class>spline_widget</class>
<extends>QWidget</extends>
- <header>spline-widget/spline-widget.hpp</header>
+ <header>spline/spline-widget.hpp</header>
</customwidget>
</customwidgets>
<resources>
diff --git a/tracker-tobii-eyex/tobii-settings.hpp b/tracker-tobii-eyex/tobii-settings.hpp
index 5c09b201..08e05ecf 100644
--- a/tracker-tobii-eyex/tobii-settings.hpp
+++ b/tracker-tobii-eyex/tobii-settings.hpp
@@ -3,8 +3,8 @@
#include "api/plugin-api.hpp"
#include "options/options.hpp"
using namespace options;
-#include "spline-widget/spline.hpp"
-#include "spline-widget/spline-widget.hpp"
+#include "spline/spline.hpp"
+#include "spline/spline-widget.hpp"
#include <functional>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 17:06:34 +0000