From b0b7c2b0e1762a7c0058e7f507a3b7cc9a03daf6 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 16 Jul 2015 11:29:59 +0200
Subject: all: use macros for symbol exposure
---
ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp | 5 +----
ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp | 8 --------
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
(limited to 'ftnoir_protocol_libevdev')
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
index f0479e0d..96805b39 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev.cpp
@@ -94,7 +94,4 @@ void FTNoIR_Protocol::pose(const double* headpose) {
(void) libevdev_uinput_write_event(uidev, EV_SYN, SYN_REPORT, 0);
}
-extern "C" OPENTRACK_EXPORT IProtocol* GetConstructor()
-{
- return new FTNoIR_Protocol;
-}
+OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, LibevdevControls, FTNoIR_ProtocolDll)
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
deleted file mode 100644
index 9a16ea52..00000000
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dll.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "ftnoir_protocol_libevdev.h"
-#include <QDebug>
-#include "opentrack/plugin-api.hpp"
-
-extern "C" OPENTRACK_EXPORT Metadata* GetMetadata()
-{
- return new FTNoIR_ProtocolDll;
-}
--
cgit v1.2.3
From 369e2ad7ffd042e5740787c95ff5f4acf2a18338 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 16 Jul 2015 11:45:26 +0200
Subject: more forgotten old-style declarations
---
ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp | 5 -----
ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp | 4 ----
2 files changed, 9 deletions(-)
(limited to 'ftnoir_protocol_libevdev')
diff --git a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
index 68a4610a..70495a8f 100644
--- a/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
+++ b/ftnoir_protocol_libevdev/ftnoir_protocol_libevdev_dialog.cpp
@@ -19,8 +19,3 @@ void LibevdevControls::doCancel() {
void LibevdevControls::save() {
}
-
-extern "C" OPENTRACK_EXPORT IProtocolDialog* GetDialog( )
-{
- return new LibevdevControls;
-}
diff --git a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
index 81fc9560..e4027c73 100644
--- a/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
+++ b/ftnoir_protocol_wine/ftnoir_protocol_wine_dialog.cpp
@@ -17,7 +17,3 @@ void FTControls::doCancel() {
this->close();
}
-extern "C" OPENTRACK_EXPORT void* GetDialog( )
-{
- return (IProtocolDialog*) new FTControls;
-}
--
cgit v1.2.3