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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 7 insertions, 46 deletions

diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine.h b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
index 50d2bc0c..9a7fb7d5 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine.h
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine.h
@@ -1,36 +1,5 @@
-/********************************************************************************
-* FaceTrackNoIR		This program is a private project of some enthusiastic		*
-*					gamers from Holland, who don't like to pay much for			*
-*					head-tracking.												*
-*																				*
-* Copyright (C) 2010	Wim Vriend (Developing)									*
-*						Ron Hendriks (Researching and Testing)					*
-*																				*
-* Homepage																		*
-*																				*
-* This program is free software; you can redistribute it and/or modify it		*
-* under the terms of the GNU General Public License as published by the			*
-* Free Software Foundation; either version 3 of the License, or (at your		*
-* option) any later version.													*
-*																				*
-* This program is distributed in the hope that it will be useful, but			*
-* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	*
-* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for	*
-* more details.																	*
-*																				*
-* You should have received a copy of the GNU General Public License along		*
-* with this program; if not, see <http://www.gnu.org/licenses/>.				*
-*																				*
-* FTServer		FTServer is the Class, that communicates headpose-data			*
-*				to games, using the FreeTrackClient.dll.		         		*
-********************************************************************************/
 #pragma once
-#ifndef INCLUDED_FTSERVER_H
-#define INCLUDED_FTSERVER_H
 
-#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
-#include "ftnoir_protocol_ft/fttypes.h"
-#include "ftnoir_csv/csv.h"
 #include "ui_ftnoir_winecontrols.h"
 #include <QMessageBox>
 #include <QLibrary>
@@ -39,15 +8,15 @@
 #include <QMutex>
 #include <QMutexLocker>
 #include <QFile>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-api.hpp"
 #include "compat/compat.h"
 #include "ftnoir_protocol_wine/wine-shm.h"
 
 class FTNoIR_Protocol : public IProtocol
 {
 public:
-	FTNoIR_Protocol();
-    virtual ~FTNoIR_Protocol();
+    FTNoIR_Protocol();
+    ~FTNoIR_Protocol() override;
 
     bool checkServerInstallationOK();
     void sendHeadposeToGame(const double* headpose);
@@ -64,7 +33,6 @@ private:
     QMutex game_name_mutex;
 };
 
-// Widget that has controls for FTNoIR protocol client-settings.
 class FTControls: public QWidget, public IProtocolDialog
 {
     Q_OBJECT
@@ -77,18 +45,15 @@ private:
     Ui::UICFTControls ui;
 
 private slots:
-	void doOK();
-	void doCancel();
+    void doOK();
+    void doCancel();
 };
 
-//*******************************************************************************************************
-// FaceTrackNoIR Protocol DLL. Functions used to get general info on the Protocol
-//*******************************************************************************************************
 class FTNoIR_ProtocolDll : public Metadata
 {
 public:
-	FTNoIR_ProtocolDll();
-	~FTNoIR_ProtocolDll();
+    FTNoIR_ProtocolDll();
+    ~FTNoIR_ProtocolDll();
 
     void getFullName(QString *strToBeFilled) { *strToBeFilled = QString("Wine"); }
     void getShortName(QString *strToBeFilled) { *strToBeFilled = QString("Wine"); }
@@ -96,7 +61,3 @@ public:
 
     void getIcon(QIcon *icon) { *icon = QIcon(":/images/wine.png"); }
 };
-
-
-#endif//INCLUDED_FTSERVER_H
-//END