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

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 3 insertions, 3 deletions

diff --git a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
index 37db314f..8af12ad7 100644
--- a/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
+++ b/ftnoir_protocol_ftn/ftnoir_protocol_ftn_dialog.cpp
@@ -23,7 +23,7 @@
 *																				*
 ********************************************************************************/
 #include "ftnoir_protocol_ftn.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
 
 FTNControls::FTNControls() :
     QWidget()
@@ -52,11 +52,11 @@ void FTNControls::doOK() {
 // Cancel clicked on server-dialog
 //
 void FTNControls::doCancel() {
-    s.b->revert();
+    s.b->reload();
     this->close();
 }
 
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
 {
     return new FTNControls;
 }