From daa0cc1348c40d7f654621f6a82b01934129a79f Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 21 Nov 2016 11:08:48 +0100 Subject: tracker/{test,steamvr}: fix duplicate class names It breaks translation. --- tracker-steamvr/dialog.cpp | 6 +++--- tracker-steamvr/steamvr.cpp | 6 +++--- tracker-steamvr/steamvr.hpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'tracker-steamvr') diff --git a/tracker-steamvr/dialog.cpp b/tracker-steamvr/dialog.cpp index 2e672ca4..bbb8866d 100644 --- a/tracker-steamvr/dialog.cpp +++ b/tracker-steamvr/dialog.cpp @@ -1,7 +1,7 @@ #include "steamvr.hpp" #include "api/plugin-api.hpp" -dialog::dialog() +steamvr_dialog::steamvr_dialog() { ui.setupUi(this); @@ -9,13 +9,13 @@ dialog::dialog() connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); } -void dialog::doOK() +void steamvr_dialog::doOK() { s.b->save(); close(); } -void dialog::doCancel() +void steamvr_dialog::doCancel() { close(); } diff --git a/tracker-steamvr/steamvr.cpp b/tracker-steamvr/steamvr.cpp index 101f9e50..bab98f0d 100644 --- a/tracker-steamvr/steamvr.cpp +++ b/tracker-steamvr/steamvr.cpp @@ -130,7 +130,7 @@ done: } } -void dialog::register_tracker(ITracker*) {} -void dialog::unregister_tracker() {} +void steamvr_dialog::register_tracker(ITracker*) {} +void steamvr_dialog::unregister_tracker() {} -OPENTRACK_DECLARE_TRACKER(steamvr, dialog, metadata) +OPENTRACK_DECLARE_TRACKER(steamvr, steamvr_dialog, steamvr_metadata) diff --git a/tracker-steamvr/steamvr.hpp b/tracker-steamvr/steamvr.hpp index 2947f3f1..9b53979e 100644 --- a/tracker-steamvr/steamvr.hpp +++ b/tracker-steamvr/steamvr.hpp @@ -40,11 +40,11 @@ private: static QString strerror(error_t error); }; -class dialog : public ITrackerDialog +class steamvr_dialog : public ITrackerDialog { Q_OBJECT public: - dialog(); + steamvr_dialog(); void register_tracker(ITracker *) override; void unregister_tracker() override; @@ -57,10 +57,10 @@ private slots: void doCancel(); }; -class metadata : public Metadata +class steamvr_metadata : public Metadata { public: - QString name() { return QString(QCoreApplication::translate("metadata", "Valve SteamVR")); } + QString name() { return QString(QCoreApplication::translate("steamvr_metadata", "Valve SteamVR")); } QIcon icon() { return QIcon(":/images/rift_tiny.png"); } }; -- cgit v1.2.3