6 files changed, 25 insertions, 22 deletions
diff --git a/proto-iokit-foohid/CMakeLists.txt b/proto-iokit-foohid/CMakeLists.txt
index cdc8fb69..6a4bf89a 100644
--- a/proto-iokit-foohid/CMakeLists.txt
+++ b/proto-iokit-foohid/CMakeLists.txt
@@ -1,4 +1,4 @@
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+if(APPLE)
     otr_module(proto-iokit-foohid)
-    set_property(TARGET opentrack-proto-iokit-foohid APPEND_STRING PROPERTY LINK_FLAGS "-framework IOKit ")
+    target_link_options(${self} PRIVATE -framework IOKit)
 endif()
diff --git a/proto-iokit-foohid/foohidjoystick.cpp b/proto-iokit-foohid/foohidjoystick.cpp
index 0b305d08..b4964bb7 100644
--- a/proto-iokit-foohid/foohidjoystick.cpp
+++ b/proto-iokit-foohid/foohidjoystick.cpp
@@ -7,8 +7,6 @@
 
 #include "foohidjoystick.h"
 
-#include "compat/macros.hpp"
-
 const char FOOHID_SERVICE_NAME[] = "it_unbit_foohid";
 
 enum class FooHIDMethod {
@@ -51,7 +49,7 @@ static bool connectToService(io_connect_t *connection, QString *errorMessage)
                                                      IOServiceMatching(FOOHID_SERVICE_NAME),
                                                      &iterator);
     if (ret != KERN_SUCCESS) {
-        *errorMessage = otr_tr("Unable to find FooHID IOService.");
+        *errorMessage = QObject::tr("Unable to find FooHID IOService.");
         return false;
     }
     // Iterate over services and try to open connection
@@ -66,7 +64,7 @@ static bool connectToService(io_connect_t *connection, QString *errorMessage)
     }
     IOObjectRelease(iterator);
     if (!found) {
-        *errorMessage = otr_tr("Unable to connect to FooHID IOService.");
+        *errorMessage = QObject::tr("Unable to connect to FooHID IOService.");
         return false;
     }
     return true;
@@ -89,7 +87,7 @@ FooHIDJoystick::FooHIDJoystick(const QByteArray &name, const QByteArray &serialN
         deviceCreated = createDevice();
         _hasError = !deviceCreated;
         if (!deviceCreated)
-            _errorMessage = otr_tr("Failed to create virtual joystick");
+            _errorMessage = tr("Failed to create virtual joystick");
     }
 }
 
@@ -116,7 +114,7 @@ void FooHIDJoystick::setValue(JoystickValues newValues)
     values = newValues;
     if (!sendToDevice()) {
         _hasError = true;
-        _errorMessage = otr_tr("Failed to send values to virtual joystick");
+        _errorMessage = tr("Failed to send values to virtual joystick");
     }
 }
 
diff --git a/proto-iokit-foohid/foohidjoystick.h b/proto-iokit-foohid/foohidjoystick.h
index a1f74304..e987c229 100644
--- a/proto-iokit-foohid/foohidjoystick.h
+++ b/proto-iokit-foohid/foohidjoystick.h
@@ -9,6 +9,7 @@
 
 #include <QByteArray>
 #include <QString>
+#include <QCoreApplication>
 
 #include <IOKit/IOKitLib.h>
 
@@ -23,6 +24,7 @@ struct JoystickValues {
 
 class FooHIDJoystick
 {
+    Q_DECLARE_TR_FUNCTIONS(FooHIDJoystick)
 public:
     FooHIDJoystick(const QByteArray &name, const QByteArray &serialNumber);
     ~FooHIDJoystick();
diff --git a/proto-iokit-foohid/iokitprotocol.cpp b/proto-iokit-foohid/iokitprotocol.cpp
index b66aeb7b..a364fd8a 100644
--- a/proto-iokit-foohid/iokitprotocol.cpp
+++ b/proto-iokit-foohid/iokitprotocol.cpp
@@ -10,8 +10,6 @@
 #include "foohidjoystick.h"
 #include "iokitprotocoldialog.h"
 
-#include "compat/macros.hpp"
-
 #include <QDebug>
 
 IOKitProtocol::IOKitProtocol()
@@ -25,14 +23,14 @@ IOKitProtocol::IOKitProtocol()
 module_status IOKitProtocol::initialize()
 {
     if (!joystick)
-        return otr_tr("Load failure");
+        return tr("Load failure");
 
     if (joystick->hasError())
     {
         QString msg = joystick->errorMessage();
 
         if (msg.isEmpty())
-            msg = otr_tr("Unknown error");
+            msg = tr("Unknown error");
 
         return error(msg);
     }
@@ -47,14 +45,14 @@ static uint8_t valueToStick(FooHIDJoystick *stick, double min, double value, dou
                    stick->minValue() + stick->range()));
 }
 
-void IOKitProtocol::pose(const double *headpose)
+void IOKitProtocol::pose(const double *headpose, const double*)
 {
-    const uint8_t x  = valueToStick(joystick.get(), -75., headpose[0], +75.);
-    const uint8_t y  = valueToStick(joystick.get(), -75., headpose[1], +75.);
-    const uint8_t z  = valueToStick(joystick.get(), -75., headpose[2], +75.);
-    const uint8_t rx = valueToStick(joystick.get(), -180., headpose[3], +180.);
-    const uint8_t ry = valueToStick(joystick.get(), -180., headpose[4], +180.);
-    const uint8_t rz = valueToStick(joystick.get(), -180., headpose[5], +180.);
+    const uint8_t x  = valueToStick(&*joystick, -75., headpose[0], +75.);
+    const uint8_t y  = valueToStick(&*joystick, -75., headpose[1], +75.);
+    const uint8_t z  = valueToStick(&*joystick, -75., headpose[2], +75.);
+    const uint8_t rx = valueToStick(&*joystick, -180., headpose[3], +180.);
+    const uint8_t ry = valueToStick(&*joystick, -180., headpose[4], +180.);
+    const uint8_t rz = valueToStick(&*joystick, -180., headpose[5], +180.);
     joystick->setValue({x, y, z, rx, ry, rz});
 }
 
diff --git a/proto-iokit-foohid/iokitprotocol.h b/proto-iokit-foohid/iokitprotocol.h
index e3a1355c..8148e7ab 100644
--- a/proto-iokit-foohid/iokitprotocol.h
+++ b/proto-iokit-foohid/iokitprotocol.h
@@ -19,7 +19,7 @@ public:
     IOKitProtocol();
 
     module_status initialize() override;
-    void pose(const double *headpose) final;
+    void pose(const double *headpose, const double*) final;
     QString game_name() final;
 
 private:
@@ -28,7 +28,8 @@ private:
 
 class IOKitProtocolMetadata : public Metadata
 {
-public:
-    QString name() { return otr_tr("Virtual joystick"); }
+    Q_OBJECT
+
+    QString name() { return tr("Virtual joystick"); }
     QIcon icon() { return QIcon(":/images/opentrack.png"); }
 };
diff --git a/proto-iokit-foohid/lang/zh_CN.ts b/proto-iokit-foohid/lang/zh_CN.ts
new file mode 100644
index 00000000..e5ca8aa9
--- /dev/null
+++ b/proto-iokit-foohid/lang/zh_CN.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="zh_CN">
+</TS>