summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_protocol_fg
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2014-09-22 11:43:13 +0200
committerStanislaw Halik <sthalik@misaki.pl>2014-09-22 11:52:55 +0200
commit32f89f4f96f92e58e73e48fb09491bdcaba1174f (patch)
treef26746415f9edd280bf815af661f5d3841162c21 /ftnoir_protocol_fg
parentfb0cd9401e26aaf610356ffe899af268012d18c3 (diff)
win32: all plugins in Windows binary distro updated to new api
Diffstat (limited to 'ftnoir_protocol_fg')
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.cpp5
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg.h3
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp2
-rw-r--r--ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp2
4 files changed, 5 insertions, 7 deletions
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
index 15a79131..45293796 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.cpp
@@ -26,8 +26,7 @@
* It is based on the (Linux) example made by Melchior FRANZ. *
********************************************************************************/
#include "ftnoir_protocol_fg.h"
-#include "facetracknoir/plugin-support.h"
-#include <ftnoir_tracker_base/ftnoir_tracker_types.h>
+#include "facetracknoir/plugin-api.hpp"
// For Todd and Arda Kutlu
@@ -58,7 +57,7 @@ bool FTNoIR_Protocol::checkServerInstallationOK()
return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
}
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
+extern "C" OPENTRACK_EXPORT IProtocol* CALLING_CONVENTION GetConstructor()
{
return new FTNoIR_Protocol;
}
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg.h b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
index f24331d9..4b25a3e1 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg.h
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg.h
@@ -26,13 +26,12 @@
* It is based on the (Linux) example made by Melchior FRANZ. *
********************************************************************************/
#pragma once
-#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
#include "ui_ftnoir_fgcontrols.h"
#include "fgtypes.h"
#include <QThread>
#include <QUdpSocket>
#include <QMessageBox>
-#include "facetracknoir/plugin-support.h"
+#include "facetracknoir/plugin-api.hpp"
#include "facetracknoir/options.h"
using namespace options;
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
index d9c596b7..eb8b9a81 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dialog.cpp
@@ -63,7 +63,7 @@ void FGControls::doCancel() {
this->close();
}
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
+extern "C" OPENTRACK_EXPORT IProtocolDialog* CALLING_CONVENTION GetDialog( )
{
return new FGControls;
}
diff --git a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
index b7e286fd..a1f065c7 100644
--- a/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
+++ b/ftnoir_protocol_fg/ftnoir_protocol_fg_dll.cpp
@@ -26,7 +26,7 @@
#include <QDebug>
#include "facetracknoir/plugin-support.h"
-extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
+extern "C" OPENTRACK_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
{
return new FTNoIR_ProtocolDll;
}