summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-06 10:01:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-06 10:01:01 +0200
commit6b1e8a3c434e9692257f21801c332a30dc2d5d48 (patch)
tree46f48ef80ad1e4104a99ca8c249fc1e816b72310
parente3140d0293de8adb584dafe264f5f4024c82ff88 (diff)
prevent redefinition error by qt moc
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt.cpp3
-rw-r--r--opentrack/camera-names.hpp2
2 files changed, 3 insertions, 2 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
index e96e7171..4d55a422 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt.cpp
@@ -12,6 +12,7 @@
#include <QFile>
#include <QCoreApplication>
#include "opentrack/thread.hpp"
+#include "opentrack/camera-names.hpp"
using namespace std;
using namespace cv;
@@ -129,8 +130,6 @@ void Tracker_PT::run()
qDebug()<<"Tracker:: Thread stopping";
}
-int camera_name_to_index(const QString &name);
-
void Tracker_PT::apply_settings()
{
qDebug()<<"Tracker:: Applying settings";
diff --git a/opentrack/camera-names.hpp b/opentrack/camera-names.hpp
index 3d3948fa..6f82ba34 100644
--- a/opentrack/camera-names.hpp
+++ b/opentrack/camera-names.hpp
@@ -13,6 +13,7 @@
# include <unistd.h>
#endif
+template<typename = void>
QList<QString> get_camera_names() {
QList<QString> ret;
#if defined(_WIN32)
@@ -82,6 +83,7 @@ QList<QString> get_camera_names() {
return ret;
}
+template<typename = void>
int camera_name_to_index(const QString &name)
{
auto list = get_camera_names();