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/ftnoir_posewidget/glwidget.h b/ftnoir_posewidget/glwidget.h
index c4b2e09d..91536336 100644
--- a/ftnoir_posewidget/glwidget.h
+++ b/ftnoir_posewidget/glwidget.h
@@ -5,12 +5,11 @@
  * copyright notice and this permission notice appear in all copies.
  */
 
-#ifndef GLWIDGET_H
-#define GLWIDGET_H
+#pragma once
 
 #include <QtGui>
 #include <QPixmap>
-#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
+#include "facetracknoir/plugin-api.hpp"
 
 struct Point {
     Point(int x, int y) :
@@ -48,7 +47,7 @@ struct Vec2f {
     }
 };
 
-class FTNOIR_TRACKER_BASE_EXPORT GLWidget : public QWidget
+class OPENTRACK_EXPORT GLWidget : public QWidget
 {
     Q_OBJECT
 
@@ -56,10 +55,8 @@ public:
     GLWidget(QWidget *parent);
     ~GLWidget();
     void rotateBy(double xAngle, double yAngle, double zAngle);
-    
 protected:
-    void paintEvent ( QPaintEvent * event );
-
+    void paintEvent ( QPaintEvent * event ) override;
 private:
     Point project(const Vec3f& point) {
         Point rect;
@@ -93,5 +90,3 @@ private:
     QImage back;
     QImage texture;
 };
-
-#endif