fix trackers for qt5

Assorted changes:
- make filenames unique, since automoc made a boo-boo
- adjust include paths, "QtGui" -> ""
- use std::shared_ptr in c++11 mode (thanks Patrick!)
- make class names unique, automoc sucks, but saves typing
- add a dummy class in one file since moronic automoc thinks
every target contains Q_OBJECTS!!!

1 files changed, 1 insertions, 5 deletions

diff --git a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
index d4741101..745d98e9 100644
--- a/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
+++ b/FTNoIR_Tracker_PT/ftnoir_tracker_pt.cpp
@@ -12,10 +12,6 @@
 #include <QFile>

 #include <QCoreApplication>

 

-#ifdef OPENTRACK_API

-#   define VideoWidget VideoWidget2

-#endif

-

 using namespace std;

 using namespace cv;

 using namespace boost;

@@ -192,7 +188,7 @@ void Tracker::update_show_video_widget()
 	{

 		const int VIDEO_FRAME_WIDTH  = 252;

 		const int VIDEO_FRAME_HEIGHT = 189;

-		video_widget = new VideoWidget(video_frame, this);

+        video_widget = new PTVideoWidget(video_frame, this);

 		QHBoxLayout* video_layout = new QHBoxLayout();

 		video_layout->setContentsMargins(0, 0, 0, 0);

 		video_layout->addWidget(video_widget);