Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 4 insertions, 9 deletions

diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h
index 0949cdc4..d485c4ff 100644
--- a/facetracknoir/curve-config.h
+++ b/facetracknoir/curve-config.h
@@ -1,21 +1,16 @@
 #pragma once
 #include <QWidget>
-#include <QPalette>
+#include "./mappings.hpp"
 #include "ui_ftnoir_curves.h"
 
-class FaceTrackNoIR;
-
-class CurveConfigurationDialog: public QWidget
+class MapWidget: public QWidget
 {
     Q_OBJECT
 public:
-    CurveConfigurationDialog( FaceTrackNoIR *ftnoir, QWidget *parent );
-    void loadSettings();
+    MapWidget(Mappings &m, main_settings &s, QWidget *parent );
 private:
     Ui::UICCurveConfigurationDialog ui;
-    void save();
-    FaceTrackNoIR *mainApp;
-
+    Mappings& m;
 private slots:
     void doOK();
     void doCancel();