summaryrefslogtreecommitdiffhomepage
path: root/tracker-ht
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-05-26 17:09:17 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-05-26 17:19:19 +0200
commitb008aefee41a21b24f1d2f1f23cd6c78b888ede5 (patch)
treefb1d42dbd30c937d956811796856453f29507382 /tracker-ht
parent47dec53450dec0264489cddb0005e13593f43399 (diff)
many modules: trivial cleanups only
- Remove "this->" where it's not needed. Possibly rename shadowed vars. - Don't reload the options bundle manually since `options::opts' exists for that very reason. - Remove '^ \+$' whitespace - :retab
Diffstat (limited to 'tracker-ht')
-rw-r--r--tracker-ht/ftnoir_tracker_ht.cpp17
-rw-r--r--tracker-ht/ht_video_widget.cpp8
2 files changed, 12 insertions, 13 deletions
diff --git a/tracker-ht/ftnoir_tracker_ht.cpp b/tracker-ht/ftnoir_tracker_ht.cpp
index cc9d2ba1..1ffc387e 100644
--- a/tracker-ht/ftnoir_tracker_ht.cpp
+++ b/tracker-ht/ftnoir_tracker_ht.cpp
@@ -96,14 +96,14 @@ void Tracker::start_tracker(QFrame* videoframe)
{
videoframe->show();
videoWidget = new HTVideoWidget(videoframe);
- QHBoxLayout* layout = new QHBoxLayout();
- layout->setContentsMargins(0, 0, 0, 0);
- layout->addWidget(videoWidget);
+ QHBoxLayout* layout_ = new QHBoxLayout();
+ layout_->setContentsMargins(0, 0, 0, 0);
+ layout_->addWidget(videoWidget);
if (videoframe->layout())
delete videoframe->layout();
- videoframe->setLayout(layout);
+ videoframe->setLayout(layout_);
videoWidget->show();
- this->layout = layout;
+ layout = layout_;
load_settings(&conf);
ht = ht_make_context(&conf, nullptr);
@@ -185,7 +185,7 @@ void Tracker::data(double* data)
TrackerControls::TrackerControls() : tracker(nullptr)
{
- ui.setupUi(this);
+ ui.setupUi(this);
ui.cameraName->clear();
QList<QString> names = get_camera_names();
names.prepend("Any available");
@@ -202,13 +202,12 @@ TrackerControls::TrackerControls() : tracker(nullptr)
void TrackerControls::doOK()
{
s.b->save();
- this->close();
+ close();
}
void TrackerControls::doCancel()
{
- s.b->reload();
- this->close();
+ close();
}
void TrackerControls::camera_settings()
diff --git a/tracker-ht/ht_video_widget.cpp b/tracker-ht/ht_video_widget.cpp
index 02fe71d1..b62b9892 100644
--- a/tracker-ht/ht_video_widget.cpp
+++ b/tracker-ht/ht_video_widget.cpp
@@ -7,15 +7,15 @@
#include "ht_video_widget.h"
-void HTVideoWidget::update_image(unsigned char *frame, int width, int height)
+void HTVideoWidget::update_image(unsigned char *frame, int width_, int height_)
{
QMutexLocker foo(&mtx);
if (!fresh)
{
- memcpy(fb, frame, width * height * 3);
- this->width = width;
- this->height = height;
+ width = width_;
+ height = height_;
fresh = true;
+ memcpy(fb, frame, width_ * height_ * 3);
}
}