OSX Build fixes

4 files changed, 9 insertions, 7 deletions

diff --git a/proto-iokit-foohid/CMakeLists.txt b/proto-iokit-foohid/CMakeLists.txt
index 31d3dcdc..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)
     target_link_options(${self} PRIVATE -framework IOKit)
 endif()
diff --git a/proto-iokit-foohid/foohidjoystick.cpp b/proto-iokit-foohid/foohidjoystick.cpp
index 0b305d08..898db2f4 100644
--- a/proto-iokit-foohid/foohidjoystick.cpp
+++ b/proto-iokit-foohid/foohidjoystick.cpp
@@ -51,7 +51,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 +66,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 +89,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 +116,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 6f163d8f..abc43a60 100644
--- a/proto-iokit-foohid/iokitprotocol.cpp
+++ b/proto-iokit-foohid/iokitprotocol.cpp
@@ -25,14 +25,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);
     }