From 6b1e8a3c434e9692257f21801c332a30dc2d5d48 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Mon, 6 Jul 2015 10:01:01 +0200
Subject: prevent redefinition error by qt moc

---
 ftnoir_tracker_pt/ftnoir_tracker_pt.cpp | 3 +--
 opentrack/camera-names.hpp              | 2 ++
 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();
-- 
cgit v1.2.3