From 12f02a22684c63ddb7bfa5989626e45b8032b9cf Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 5 May 2019 01:18:21 +0200
Subject: proto/libevdev: fix build

Issue: #944
---
 proto-libevdev/ftnoir_protocol_libevdev.cpp | 8 ++++----
 proto-libevdev/lang/nl_NL.ts                | 4 ----
 proto-libevdev/lang/ru_RU.ts                | 4 ----
 proto-libevdev/lang/stub.ts                 | 4 ----
 proto-libevdev/lang/zh_CN.ts                | 4 ----
 5 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'proto-libevdev')

diff --git a/proto-libevdev/ftnoir_protocol_libevdev.cpp b/proto-libevdev/ftnoir_protocol_libevdev.cpp
index ba3c3fcb..00f5fd07 100644
--- a/proto-libevdev/ftnoir_protocol_libevdev.cpp
+++ b/proto-libevdev/ftnoir_protocol_libevdev.cpp
@@ -18,10 +18,10 @@
 
 #define CHECK_LIBEVDEV(expr)                                    \
     do {                                                        \
-        if ((int error = (expr)); error != 0)                   \
+        if (int error = (expr); error != 0)                     \
         {                                                       \
             error_code = -error;                                \
-            error_str = #expr;                                  \
+            error_expr = #expr;                                 \
             goto fail;                                          \
         }                                                       \
     } while (false)
@@ -37,7 +37,7 @@ evdev::evdev()
     if (!dev)
     {
         error_code = errno;
-        error_str = "libevdev_new();";
+        error_expr = "libevdev_new();";
         goto fail;
     }
 
@@ -123,7 +123,7 @@ module_status evdev::initialize()
         char buf[128] {};
         (void)strerror_r(errno, buf, sizeof(buf));
         return error(QStringLiteral("libevdev call '%1' failed with error '%2' (%3)")
-                     .arg(error_str ? "<NULL>" : error_str, buf, error_code));
+                     .arg(!error_expr ? "<NULL>" : error_expr, buf).arg(error_code));
     }
     else
         return {};
diff --git a/proto-libevdev/lang/nl_NL.ts b/proto-libevdev/lang/nl_NL.ts
index 90ed636a..462ea6fc 100644
--- a/proto-libevdev/lang/nl_NL.ts
+++ b/proto-libevdev/lang/nl_NL.ts
@@ -26,10 +26,6 @@
         <source>Virtual joystick for Linux</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Can&apos;t open /dev/uinput: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>evdevDll</name>
diff --git a/proto-libevdev/lang/ru_RU.ts b/proto-libevdev/lang/ru_RU.ts
index cdf8920d..f659b1dd 100644
--- a/proto-libevdev/lang/ru_RU.ts
+++ b/proto-libevdev/lang/ru_RU.ts
@@ -22,10 +22,6 @@
 </context>
 <context>
     <name>evdev</name>
-    <message>
-        <source>Can&apos;t open /dev/uinput: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Virtual joystick for Linux</source>
         <translation type="unfinished"></translation>
diff --git a/proto-libevdev/lang/stub.ts b/proto-libevdev/lang/stub.ts
index ae2e5c96..5250e21a 100644
--- a/proto-libevdev/lang/stub.ts
+++ b/proto-libevdev/lang/stub.ts
@@ -22,10 +22,6 @@
 </context>
 <context>
     <name>evdev</name>
-    <message>
-        <source>Can&apos;t open /dev/uinput: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Virtual joystick for Linux</source>
         <translation type="unfinished"></translation>
diff --git a/proto-libevdev/lang/zh_CN.ts b/proto-libevdev/lang/zh_CN.ts
index ae2e5c96..5250e21a 100644
--- a/proto-libevdev/lang/zh_CN.ts
+++ b/proto-libevdev/lang/zh_CN.ts
@@ -22,10 +22,6 @@
 </context>
 <context>
     <name>evdev</name>
-    <message>
-        <source>Can&apos;t open /dev/uinput: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Virtual joystick for Linux</source>
         <translation type="unfinished"></translation>
-- 
cgit v1.2.3