diff options
36 files changed, 62 insertions, 59 deletions
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h index 990a9750..e31def89 100644 --- a/filter-accela/ftnoir_filter_accela.h +++ b/filter-accela/ftnoir_filter_accela.h @@ -12,6 +12,7 @@ #include "api/plugin-api.hpp" #include "compat/timer.hpp" #include "compat/variance.hpp" +#include "compat/macros.hpp" #include <QMutex> #include <QTimer> @@ -56,6 +57,6 @@ private slots: class accelaDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("accelaDll", "Accela")); } + QString name() { return otr_tr("Accela"); } QIcon icon() { return QIcon(":/images/filter-16.png"); } }; diff --git a/filter-ewma2/ftnoir_filter_ewma2.h b/filter-ewma2/ftnoir_filter_ewma2.h index 4c019bd0..b53037f7 100644 --- a/filter-ewma2/ftnoir_filter_ewma2.h +++ b/filter-ewma2/ftnoir_filter_ewma2.h @@ -59,6 +59,6 @@ private slots: class ewmaDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("ewmaDll", "EWMA")); } + QString name() { return otr_tr("EWMA"); } QIcon icon() { return QIcon(":/images/filter-16.png"); } }; diff --git a/filter-kalman/kalman.h b/filter-kalman/kalman.h index 607580dd..8fa9e716 100644 --- a/filter-kalman/kalman.h +++ b/filter-kalman/kalman.h @@ -157,7 +157,7 @@ public: class kalmanDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("kalmanDll", "Kalman")); } + QString name() { return otr_tr("Kalman"); } QIcon icon() { return QIcon(":/images/filter-16.png"); } }; diff --git a/logic/runtime-libraries.cpp b/logic/runtime-libraries.cpp index 8feeaaba..bfa7f2a4 100644 --- a/logic/runtime-libraries.cpp +++ b/logic/runtime-libraries.cpp @@ -6,7 +6,7 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f) { module_status status = - module_status_mixin::error(QCoreApplication::translate("module", "Library load failure")); + module_status_mixin::error(otr_tr("Library load failure")); using namespace options; @@ -19,7 +19,7 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli if(status = pProtocol->check_status(), !status.is_ok()) { - status = QCoreApplication::translate("module", "Error occured while loading protocol %1\n\n%2\n") + status = otr_tr("Error occured while loading protocol %1\n\n%2\n") .arg(p->name).arg(status.error); goto end; } @@ -36,14 +36,14 @@ runtime_libraries::runtime_libraries(QFrame* frame, dylibptr t, dylibptr p, dyli if (pFilter) if(status = pFilter->check_status(), !status.is_ok()) { - status = QCoreApplication::translate("module", "Error occured while loading filter %1\n\n%2\n") + status = otr_tr("Error occured while loading filter %1\n\n%2\n") .arg(f->name).arg(status.error); goto end; } if (status = pTracker->start_tracker(frame), !status.is_ok()) { - status = QCoreApplication::translate("module", "Error occured while loading tracker %1\n\n%2\n") + status = otr_tr("Error occured while loading tracker %1\n\n%2\n") .arg(t->name).arg(status.error); goto end; } diff --git a/logic/work.cpp b/logic/work.cpp index 53407f7c..07691535 100644 --- a/logic/work.cpp +++ b/logic/work.cpp @@ -16,9 +16,9 @@ QString Work::browse_datalogging_file(main_settings &s) Since the freeze is apparently random, I'm not sure it helped. */ QString newfilename = QFileDialog::getSaveFileName(nullptr, - QCoreApplication::translate("Work", "Select filename"), + otr_tr("Select filename"), filename, - QCoreApplication::translate("Work", "CSV File (*.csv)"), + otr_tr("CSV File (*.csv)"), nullptr); if (!newfilename.isEmpty()) { @@ -44,10 +44,10 @@ std::shared_ptr<TrackLogger> Work::make_logger(main_settings &s) if (!logger->is_open()) { logger = nullptr; - QMessageBox::warning(nullptr, QCoreApplication::translate("Work", "Logging error"), - QCoreApplication::translate("Work", "Unable to open file '%1'. Proceeding without logging.").arg(s.tracklogging_filename), - QMessageBox::Ok, - QMessageBox::NoButton); + QMessageBox::warning(nullptr, + otr_tr("Logging error"), + otr_tr("Unable to open file '%1'. Proceeding without logging.").arg(s.tracklogging_filename), + QMessageBox::Ok, QMessageBox::NoButton); } else { diff --git a/proto-flightgear/ftnoir_protocol_fg.cpp b/proto-flightgear/ftnoir_protocol_fg.cpp index e1101c0f..5db12e03 100644 --- a/proto-flightgear/ftnoir_protocol_fg.cpp +++ b/proto-flightgear/ftnoir_protocol_fg.cpp @@ -30,7 +30,7 @@ module_status flightgear::check_status() if (outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint)) return status_ok(); else - return error(QCoreApplication::translate("flightgear", "Can't bind to [%1.%2.%3.%4]:%5") + return error(otr_tr("Can't bind to [%1.%2.%3.%4]:%5") .arg(s.ip1).arg(s.ip2).arg(s.ip3).arg(s.ip4) .arg(s.port)); } diff --git a/proto-flightgear/ftnoir_protocol_fg.h b/proto-flightgear/ftnoir_protocol_fg.h index 31a7660c..8ba7c7c8 100644 --- a/proto-flightgear/ftnoir_protocol_fg.h +++ b/proto-flightgear/ftnoir_protocol_fg.h @@ -42,7 +42,7 @@ class flightgear : public IProtocol { public: void pose(const double *headpose); - QString game_name() { return QCoreApplication::translate("flightgear", "FlightGear"); } + QString game_name() { return otr_tr("FlightGear"); } module_status check_status() override; private: settings s; @@ -69,6 +69,6 @@ private slots: class flightgearDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("flightgearDll", "FlightGear")); } + QString name() { return otr_tr("FlightGear"); } QIcon icon() { return QIcon(":/images/flightgear.png"); } }; diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp index b5259581..fba893bc 100644 --- a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp +++ b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp @@ -149,7 +149,7 @@ module_status fsuipc::check_status() FSUIPCLib.setFileName( s.LocationOfDLL ); if (FSUIPCLib.load() != true) - return error(QCoreApplication::translate("fsuipc", "Can't load fsuipc at '%1'").arg(s.LocationOfDLL)); + return error(otr_tr("Can't load fsuipc at '%1'").arg(s.LocationOfDLL)); else return status_ok(); } diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.h b/proto-fsuipc/ftnoir_protocol_fsuipc.h index 54171ce7..bbfd265b 100644 --- a/proto-fsuipc/ftnoir_protocol_fsuipc.h +++ b/proto-fsuipc/ftnoir_protocol_fsuipc.h @@ -52,7 +52,7 @@ public: ~fsuipc() override; module_status check_status() override; void pose(const double* headpose); - QString game_name() { return QCoreApplication::translate("fsuipc", "Microsoft Flight Simulator X"); } + QString game_name() { return otr_tr("Microsoft Flight Simulator X"); } private: QLibrary FSUIPCLib; double prevPosX, prevPosY, prevPosZ, prevRotX, prevRotY, prevRotZ; @@ -81,7 +81,7 @@ private slots: class fsuipcDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("fsuipcDll", "FSUIPC -- Microsoft FS2002/FS2004")); } + QString name() { return otr_tr("FSUIPC -- Microsoft FS2002/FS2004"); } QIcon icon() { return QIcon(":/images/fs9.png"); } }; diff --git a/proto-iokit-foohid/foohidjoystick.cpp b/proto-iokit-foohid/foohidjoystick.cpp index 17a4bcb5..0b305d08 100644 --- a/proto-iokit-foohid/foohidjoystick.cpp +++ b/proto-iokit-foohid/foohidjoystick.cpp @@ -7,7 +7,7 @@ #include "foohidjoystick.h" -#include <QCoreApplication> +#include "compat/macros.hpp" const char FOOHID_SERVICE_NAME[] = "it_unbit_foohid"; @@ -51,7 +51,7 @@ static bool connectToService(io_connect_t *connection, QString *errorMessage) IOServiceMatching(FOOHID_SERVICE_NAME), &iterator); if (ret != KERN_SUCCESS) { - *errorMessage = QCoreApplication::translate("iokit-foohid", "Unable to find FooHID IOService."); + *errorMessage = otr_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 = QCoreApplication::translate("iokit-foohid", "Unable to connect to FooHID IOService."); + *errorMessage = otr_tr("Unable to connect to FooHID IOService."); return false; } return true; @@ -89,8 +89,7 @@ FooHIDJoystick::FooHIDJoystick(const QByteArray &name, const QByteArray &serialN deviceCreated = createDevice(); _hasError = !deviceCreated; if (!deviceCreated) - _errorMessage = QCoreApplication::translate("iokit-foohid", - "Failed to create virtual joystick"); + _errorMessage = otr_tr("Failed to create virtual joystick"); } } @@ -117,8 +116,7 @@ void FooHIDJoystick::setValue(JoystickValues newValues) values = newValues; if (!sendToDevice()) { _hasError = true; - _errorMessage = QCoreApplication::translate("iokit-foohid", - "Failed to send values to virtual joystick"); + _errorMessage = otr_tr("Failed to send values to virtual joystick"); } } diff --git a/proto-iokit-foohid/iokitprotocol.cpp b/proto-iokit-foohid/iokitprotocol.cpp index 693ce31e..d3f0d2c9 100644 --- a/proto-iokit-foohid/iokitprotocol.cpp +++ b/proto-iokit-foohid/iokitprotocol.cpp @@ -10,6 +10,8 @@ #include "foohidjoystick.h" #include "iokitprotocoldialog.h" +#include "compat/macros.hpp" + #include <QDebug> IOKitProtocol::IOKitProtocol() @@ -23,14 +25,14 @@ IOKitProtocol::IOKitProtocol() module_status IOKitProtocol::check_status() { if (!joystick) - return QCoreApplication::translate("foohid", "Load failure"); + return otr_tr("Load failure"); if (joystick->hasError()) { QString msg = joystick->errorMessage(); if (msg.isEmpty()) - msg = QCoreApplication::translate("foohid", "Unknown error"); + msg = otr_tr("Unknown error"); return error(msg); } diff --git a/proto-iokit-foohid/iokitprotocol.h b/proto-iokit-foohid/iokitprotocol.h index 4c5b13a4..39bccf52 100644 --- a/proto-iokit-foohid/iokitprotocol.h +++ b/proto-iokit-foohid/iokitprotocol.h @@ -29,6 +29,6 @@ private: class IOKitProtocolMetadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("iokit-foohid", "Virtual joystick")); } + QString name() { return otr_tr("Virtual joystick"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; diff --git a/proto-libevdev/ftnoir_protocol_libevdev.h b/proto-libevdev/ftnoir_protocol_libevdev.h index 6f7e4695..5606cbdf 100644 --- a/proto-libevdev/ftnoir_protocol_libevdev.h +++ b/proto-libevdev/ftnoir_protocol_libevdev.h @@ -25,7 +25,7 @@ public: } void pose(const double *headpose); QString game_name() { - return "Virtual joystick for Linux"; + return otr_tr("Virtual joystick for Linux"); } private: struct libevdev* dev; diff --git a/proto-mouse/ftnoir_protocol_mouse.cpp b/proto-mouse/ftnoir_protocol_mouse.cpp index 80426460..68d0ef28 100644 --- a/proto-mouse/ftnoir_protocol_mouse.cpp +++ b/proto-mouse/ftnoir_protocol_mouse.cpp @@ -57,7 +57,7 @@ void mouse::pose(const double *headpose) QString mouse::game_name() { - return "Mouse tracker"; + return otr_tr("Mouse tracker"); } int mouse::get_delta(int val, int prev) diff --git a/proto-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h index 99557d17..a909c74a 100644 --- a/proto-mouse/ftnoir_protocol_mouse.h +++ b/proto-mouse/ftnoir_protocol_mouse.h @@ -59,6 +59,6 @@ private slots: class mouseDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("mouseDll", "mouse emulation")); } + QString name() { return otr_tr("mouse emulation"); } QIcon icon() { return QIcon(":/images/mouse.png"); } }; diff --git a/proto-simconnect/ftnoir_protocol_sc.h b/proto-simconnect/ftnoir_protocol_sc.h index 4174bc0c..afea0d3d 100644 --- a/proto-simconnect/ftnoir_protocol_sc.h +++ b/proto-simconnect/ftnoir_protocol_sc.h @@ -43,7 +43,7 @@ public: void pose(const double* headpose); void handle(); QString game_name() { - return "FS2004/FSX"; + return otr_tr("FS2004/FSX"); } private: enum { @@ -110,6 +110,6 @@ private slots: class simconnectDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("simconnectDll", "Microsoft FSX SimConnect")); } + QString name() { return otr_tr("Microsoft FSX SimConnect"); } QIcon icon() { return QIcon(":/images/fsx.png"); } }; diff --git a/proto-udp/ftnoir_protocol_ftn.h b/proto-udp/ftnoir_protocol_ftn.h index 7838f01a..a28097cb 100644 --- a/proto-udp/ftnoir_protocol_ftn.h +++ b/proto-udp/ftnoir_protocol_ftn.h @@ -40,7 +40,7 @@ public: module_status check_status() override; void pose(const double *headpose); QString game_name() { - return QCoreApplication::translate("udp_proto", "UDP over network"); + return otr_tr("UDP over network"); } private: QUdpSocket outSocket; @@ -73,6 +73,6 @@ private slots: class udpDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("udp_proto", "UDP over network")); } + QString name() { return otr_tr("UDP over network"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; diff --git a/proto-vjoystick/vjoystick.cpp b/proto-vjoystick/vjoystick.cpp index 9ff64998..1f849e11 100644 --- a/proto-vjoystick/vjoystick.cpp +++ b/proto-vjoystick/vjoystick.cpp @@ -99,11 +99,11 @@ vjoystick_proto::vjoystick_proto() { QMessageBox msgbox; msgbox.setIcon(QMessageBox::Critical); - msgbox.setText(QCoreApplication::translate("vjoystick_proto", "vjoystick driver missing")); - msgbox.setInformativeText(QCoreApplication::translate("vjoystick_proto", "vjoystick won't work without the driver installed.")); + msgbox.setText(otr_tr("vjoystick driver missing")); + msgbox.setInformativeText(otr_tr("vjoystick won't work without the driver installed.")); - QPushButton* driver_button = msgbox.addButton(QCoreApplication::translate("vjoystick_proto", "Download the driver"), QMessageBox::ActionRole); - QPushButton* project_site_button = msgbox.addButton(QCoreApplication::translate("vjoystick_proto", "Visit project site"), QMessageBox::ActionRole); + QPushButton* driver_button = msgbox.addButton(otr_tr("Download the driver"), QMessageBox::ActionRole); + QPushButton* project_site_button = msgbox.addButton(otr_tr("Visit project site"), QMessageBox::ActionRole); msgbox.addButton(QMessageBox::Close); (void) msgbox.exec(); diff --git a/proto-vjoystick/vjoystick.h b/proto-vjoystick/vjoystick.h index 0eac2ed2..742d5b47 100644 --- a/proto-vjoystick/vjoystick.h +++ b/proto-vjoystick/vjoystick.h @@ -8,6 +8,7 @@ #pragma once #include "ui_vjoystick.h" #include "api/plugin-api.hpp" +#include "compat/macros.hpp" #include <windows.h> @@ -55,7 +56,7 @@ public: ~vjoystick_proto() override; module_status check_status() override; void pose( const double *headpose ) override; - QString game_name() override { return "Virtual joystick"; } + QString game_name() override { return otr_tr("Virtual joystick"); } private: }; @@ -74,6 +75,6 @@ private: class vjoystick_metadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("vjoystick_metadata", "Joystick emulation -- vjoystick")); } + QString name() { return otr_tr("Joystick emulation -- vjoystick"); } QIcon icon() { return QIcon(":/images/vjoystick.png"); } }; diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp index 36c01c25..dd1370e2 100644 --- a/proto-wine/ftnoir_protocol_wine.cpp +++ b/proto-wine/ftnoir_protocol_wine.cpp @@ -9,6 +9,7 @@ #include <sys/stat.h> /* For mode constants */ #include <fcntl.h> /* For O_* constants */ #include "csv/csv.h" +#include "compat/macros.hpp" wine::wine() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0) { @@ -59,7 +60,7 @@ module_status wine::check_status() if (lck_shm.success()) return status_ok(); else - return error(QCoreApplication::translate("wine", "Can't open shared memory mapping")); + return error(otr_tr("Can't open shared memory mapping")); } OPENTRACK_DECLARE_PROTOCOL(wine, FTControls, wineDll) diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h index 1b609470..cc5d0be0 100644 --- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h +++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h @@ -62,7 +62,7 @@ private slots: class meta_freepie : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("meta_freepie", "FreePIE UDP receiver")); } + QString name() { return otr_tr("FreePIE UDP receiver"); } QIcon icon() { return QIcon(":/glovepie.png"); } }; diff --git a/tracker-fusion/fusion.h b/tracker-fusion/fusion.h index 96a1a496..6b0e0b1e 100644 --- a/tracker-fusion/fusion.h +++ b/tracker-fusion/fusion.h @@ -52,7 +52,7 @@ private slots: class fusion_metadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("fusion_metadata", "Fusion")); } + QString name() { return otr_tr("Fusion"); } QIcon icon() { return QIcon(":/images/fusion-tracker-logo.png"); } }; diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h index 45b3f250..0f4b2c9c 100644 --- a/tracker-hatire/ftnoir_tracker_hat.h +++ b/tracker-hatire/ftnoir_tracker_hat.h @@ -48,6 +48,6 @@ private: class hatire_metadata : public Metadata { - QString name() { return QString(QCoreApplication::translate("hatire_metadata", "Hatire Arduino")); } + QString name() { return otr_tr("Hatire Arduino"); } QIcon icon() { return QIcon(":/images/hat.png"); } }; diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h index bba4ad3e..6b0e7497 100644 --- a/tracker-joystick/ftnoir_tracker_joystick.h +++ b/tracker-joystick/ftnoir_tracker_joystick.h @@ -72,7 +72,7 @@ private slots: class joystickDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("joystickDll", "Joystick input")); } + QString name() { return otr_tr("Joystick input"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index ad7f56ff..78bab215 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -93,7 +93,7 @@ private: class PT_metadata : public Metadata { - QString name() { return QString(QCoreApplication::translate("PT_metadata", "PointTracker 1.1")); } + QString name() { return otr_tr("PointTracker 1.1"); } QIcon icon() { return QIcon(":/Resources/Logo_IR.png"); } }; diff --git a/tracker-qt-gamepad/test.h b/tracker-qt-gamepad/test.h index ffa9ac44..507697b5 100644 --- a/tracker-qt-gamepad/test.h +++ b/tracker-qt-gamepad/test.h @@ -39,7 +39,7 @@ private slots: class gamepad_metadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("gamepad_metadata", "Gamepad input")); } + QString name() { return otr_tr("Gamepad input"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.h b/tracker-rift-025/ftnoir_tracker_rift_025.h index 37ffcdaa..f71c3cd8 100644 --- a/tracker-rift-025/ftnoir_tracker_rift_025.h +++ b/tracker-rift-025/ftnoir_tracker_rift_025.h @@ -59,7 +59,7 @@ private slots: class rift_025Dll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("rift_025Dll", "Oculus Rift runtime 0.2.5 -- HMD")); } + QString name() { return otr_tr("Oculus Rift runtime 0.2.5 -- HMD"); } QIcon icon() { return QIcon(":/images/rift_tiny.png"); } }; diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.h b/tracker-rift-042/ftnoir_tracker_rift_042.h index 630878b9..a662b564 100644 --- a/tracker-rift-042/ftnoir_tracker_rift_042.h +++ b/tracker-rift-042/ftnoir_tracker_rift_042.h @@ -56,7 +56,7 @@ private slots: class rift_042Dll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("rift_042Dll", "Oculus Rift runtime 0.4.2 -- HMD")); } + QString name() { return otr_tr("Oculus Rift runtime 0.4.2 -- HMD"); } QIcon icon() { return QIcon(":/images/rift_tiny.png"); } }; diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h index e7fccb5e..e5e92e3d 100644 --- a/tracker-rift-080/ftnoir_tracker_rift_080.h +++ b/tracker-rift-080/ftnoir_tracker_rift_080.h @@ -53,7 +53,7 @@ private slots: class rift_080Dll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("rift_080Dll", "Oculus Rift runtime 0.8.0 -- HMD")); } + QString name() { return otr_tr("Oculus Rift runtime 0.8.0 -- HMD"); } QIcon icon() { return QIcon(":/images/rift_tiny.png"); } }; diff --git a/tracker-rift-140/rift-140.hpp b/tracker-rift-140/rift-140.hpp index 13bebed4..1a6714d5 100644 --- a/tracker-rift-140/rift-140.hpp +++ b/tracker-rift-140/rift-140.hpp @@ -54,7 +54,7 @@ private slots: class rift_140Dll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("rift_140Dll", "Oculus Rift runtime 1.4.0 -- HMD")); } + QString name() { return otr_tr("Oculus Rift runtime 1.4.0 -- HMD"); } QIcon icon() { return QIcon(":/images/rift_tiny.png"); } }; diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp index ebcdac33..7c4f42a4 100644 --- a/tracker-rs/ftnoir_tracker_rs.cpp +++ b/tracker-rs/ftnoir_tracker_rs.cpp @@ -147,7 +147,7 @@ RSTracker::~RSTracker() { } QString RSTrackerMetaData::name() { - return QString(QCoreApplication::translate("RSTrackerMetaData", "Intel® RealSense™ Technology")); + return otr_tr("Intel® RealSense™ Technology"); } QIcon RSTrackerMetaData::icon() { diff --git a/tracker-s2bot/ftnoir_tracker_s2bot.h b/tracker-s2bot/ftnoir_tracker_s2bot.h index f0493284..eddf58f4 100644 --- a/tracker-s2bot/ftnoir_tracker_s2bot.h +++ b/tracker-s2bot/ftnoir_tracker_s2bot.h @@ -66,7 +66,7 @@ private slots: class meta_s2bot : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("meta_s2bot", "S2Bot receiver")); } + QString name() { return otr_tr("S2Bot receiver"); } QIcon icon() { return QIcon(":/s2bot.png"); } }; diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp index c8712b20..95829492 100644 --- a/tracker-steamvr/steamvr.hpp +++ b/tracker-steamvr/steamvr.hpp @@ -108,6 +108,6 @@ private slots: class steamvr_metadata : public Metadata { public: - QString name() override { return QString(QCoreApplication::translate("steamvr_metadata", "Valve SteamVR")); } + QString name() override { return otr_tr("Valve SteamVR"); } QIcon icon() override { return QIcon(":/images/rift_tiny.png"); } }; diff --git a/tracker-test/test.h b/tracker-test/test.h index 1b432be2..0d1c9b8d 100644 --- a/tracker-test/test.h +++ b/tracker-test/test.h @@ -36,7 +36,7 @@ private slots: class test_metadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("test_metadata", "Testing - sine wave")); } + QString name() { return otr_tr("Testing - sine wave"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; diff --git a/tracker-tobii-eyex/tobii-eyex.cpp b/tracker-tobii-eyex/tobii-eyex.cpp index 604931d6..a559c8dd 100644 --- a/tracker-tobii-eyex/tobii-eyex.cpp +++ b/tracker-tobii-eyex/tobii-eyex.cpp @@ -229,7 +229,7 @@ module_status tobii_eyex_tracker::start_tracker(QFrame*) status &= txEnableConnection(dev_ctx) == TX_RESULT_OK; if (!status) - return error(QCoreApplication::translate("tobii", "Connection can't be established. device missing?")); + return error(otr_tr("Connection can't be established. device missing?")); else return status_ok(); } diff --git a/tracker-udp/ftnoir_tracker_udp.h b/tracker-udp/ftnoir_tracker_udp.h index 8e8a385c..1db67256 100644 --- a/tracker-udp/ftnoir_tracker_udp.h +++ b/tracker-udp/ftnoir_tracker_udp.h @@ -53,7 +53,7 @@ private slots: class udpDll : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("udp_tracker", "UDP over network")); } + QString name() { return otr_tr("UDP over network"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; |