summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-11-21 11:08:48 +0100
committerStanislaw Halik <sthalik@misaki.pl>2016-11-21 11:08:48 +0100
commitdaa0cc1348c40d7f654621f6a82b01934129a79f (patch)
tree96b91d2dea2a065c541d995da84a5c9df95f7f8f
parent9fb8b48027ac8c03628955da2b186de88745e348 (diff)
tracker/{test,steamvr}: fix duplicate class names
It breaks translation.
-rw-r--r--tracker-steamvr/dialog.cpp6
-rw-r--r--tracker-steamvr/steamvr.cpp6
-rw-r--r--tracker-steamvr/steamvr.hpp8
-rw-r--r--tracker-test/test.cpp8
-rw-r--r--tracker-test/test.h8
5 files changed, 18 insertions, 18 deletions
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"); }
};
diff --git a/tracker-test/test.cpp b/tracker-test/test.cpp
index eba1f603..78c72178 100644
--- a/tracker-test/test.cpp
+++ b/tracker-test/test.cpp
@@ -77,7 +77,7 @@ void test_tracker::data(double *data)
}
}
-dialog::dialog()
+test_dialog::test_dialog()
{
ui.setupUi(this);
@@ -85,15 +85,15 @@ dialog::dialog()
connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
}
-void dialog::doOK()
+void test_dialog::doOK()
{
//s.b->save();
close();
}
-void dialog::doCancel()
+void test_dialog::doCancel()
{
close();
}
-OPENTRACK_DECLARE_TRACKER(test_tracker, dialog, metadata)
+OPENTRACK_DECLARE_TRACKER(test_tracker, test_dialog, test_metadata)
diff --git a/tracker-test/test.h b/tracker-test/test.h
index fd446f98..8338e8f3 100644
--- a/tracker-test/test.h
+++ b/tracker-test/test.h
@@ -22,13 +22,13 @@ private:
Timer t;
};
-class dialog: public ITrackerDialog
+class test_dialog : public ITrackerDialog
{
Q_OBJECT
Ui::test_ui ui;
public:
- dialog();
+ test_dialog();
void register_tracker(ITracker *) override {}
void unregister_tracker() override {}
private slots:
@@ -36,10 +36,10 @@ private slots:
void doCancel();
};
-class metadata : public Metadata
+class test_metadata : public Metadata
{
public:
- QString name() { return QString(QCoreApplication::translate("metadata", "Testing - sine wave")); }
+ QString name() { return QString(QCoreApplication::translate("test_metadata", "Testing - sine wave")); }
QIcon icon() { return QIcon(":/images/facetracknoir.png"); }
};