From da207036f8e9f4b8e431bbabba30813b5d65cbf8 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 3 May 2018 14:59:40 +0200
Subject: tracker/{rift,steamvr}: rename reserved identifier

Could be declared as macro.

Issue: #771
---
 tracker-rift-080/ftnoir_tracker_rift_080.cpp | 8 ++++----
 tracker-rift-140/rift-140.cpp                | 8 ++++----
 tracker-steamvr/steamvr.cpp                  | 6 +++---
 tracker-steamvr/steamvr.hpp                  | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
index c9f5e4ee..896ad8ef 100644
--- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp
+++ b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
@@ -58,11 +58,11 @@ error:
     err.ErrorString[0] = '\0';
     ovr_GetLastErrorInfo(&err);
 
-    QString strerror(err.ErrorString);
-    if (strerror.size() == 0)
-        strerror = "Unknown reason";
+    QString error_string(err.ErrorString);
+    if (error_string.size() == 0)
+        error_string = "Unknown reason";
 
-    return error(strerror);
+    return error(error_string);
 }
 
 void rift_tracker_080::data(double *data)
diff --git a/tracker-rift-140/rift-140.cpp b/tracker-rift-140/rift-140.cpp
index bf02191a..5ed2866b 100644
--- a/tracker-rift-140/rift-140.cpp
+++ b/tracker-rift-140/rift-140.cpp
@@ -49,13 +49,13 @@ error:
     ovrErrorInfo err;
     ovr_GetLastErrorInfo(&err);
 
-    QString strerror(err.ErrorString);
-    if (strerror.size() == 0)
-        strerror = QStringLiteral("Unknown reason #%1").arg(err.Result);
+    QString error_string(err.ErrorString);
+    if (error_string.size() == 0)
+        error_string = QStringLiteral("Unknown reason #%1").arg(err.Result);
 
     ovr_Shutdown();
 
-    return error(strerror);
+    return error(error_string);
 }
 
 void rift_tracker_140::data(double *data)
diff --git a/tracker-steamvr/steamvr.cpp b/tracker-steamvr/steamvr.cpp
index fd21187b..7bb2fb22 100644
--- a/tracker-steamvr/steamvr.cpp
+++ b/tracker-steamvr/steamvr.cpp
@@ -164,12 +164,12 @@ tt device_list::vr_init_()
     if (v)
         std::atexit(vr::VR_Shutdown);
     else
-        qDebug() << "steamvr: init failure" << error << device_list::strerror(error);
+        qDebug() << "steamvr: init failure" << error << device_list::error_string(error);
 
     return tt(v, error);
 }
 
-QString device_list::strerror(vr_error_t err)
+QString device_list::error_string(vr_error_t err)
 {
     const char* str(vr::VR_GetVRInitErrorAsSymbol(err));
     return QString(str ? str : "No description");
@@ -191,7 +191,7 @@ module_status steamvr::start_tracker(QFrame*)
 
         if (!v)
         {
-            err = device_list::strerror(e);
+            err = device_list::error_string(e);
             return error(err);
         }
 
diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp
index 73964593..c4e10adb 100644
--- a/tracker-steamvr/steamvr.hpp
+++ b/tracker-steamvr/steamvr.hpp
@@ -55,7 +55,7 @@ struct device_list final
     const QList<device_spec>& devices() const { return device_specs; }
 
     static never_inline maybe_pose get_pose(int k);
-    static QString strerror(vr_error_t error);
+    static QString error_string(vr_error_t error);
     static constexpr inline unsigned max_devices = vr::k_unMaxTrackedDeviceCount;
 
     template<typename F>
-- 
cgit v1.2.3