Merge branch 'unstable' into trackhat

* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name

1 files changed, 18 insertions, 0 deletions

diff --git a/gui/curve-config.h b/gui/curve-config.h
new file mode 100644
index 00000000..0cbc7055
--- /dev/null
+++ b/gui/curve-config.h
@@ -0,0 +1,18 @@
+#pragma once
+#include <QWidget>
+#include "opentrack/mappings.hpp"
+#include "ui_mapping.h"
+
+class MapWidget: public QWidget
+{
+    Q_OBJECT
+public:
+    MapWidget(Mappings &m, main_settings &s);
+private:
+    Ui::UICCurveConfigurationDialog ui;
+    Mappings& m;
+    void closeEvent(QCloseEvent *) override { doCancel(); }
+private slots:
+    void doOK();
+    void doCancel();
+};