summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-10-15 08:52:25 +0200
committerStanislaw Halik <sthalik@misaki.pl>2013-10-15 08:52:25 +0200
commit864910a1fb753629d2852a91ffae4ebba374358c (patch)
tree7fbee6d32dd5312e592ab3a41219a7daa9cf56ae /ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
parenta73f49c89299ec69dda73e3e7a16cebe76da373e (diff)
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!!!
Diffstat (limited to 'ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp')
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index 8025e956..c735b479 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -148,7 +148,7 @@ Tracker::~Tracker()
void Tracker::StartTracker(QFrame* videoframe)
{
videoframe->show();
- videoWidget = new VideoWidget(videoframe);
+ videoWidget = new ArucoVideoWidget(videoframe);
QHBoxLayout* layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0);
layout->addWidget(videoWidget);