From b89699c7551f768bf4ff47820543f8c7b8c794af Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 4 Nov 2016 19:15:54 +0100 Subject: modules: make names unique --- tracker-udp/ftnoir_tracker_udp.cpp | 12 ++++++------ tracker-udp/ftnoir_tracker_udp.h | 12 ++++++------ tracker-udp/ftnoir_tracker_udp_dialog.cpp | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tracker-udp') diff --git a/tracker-udp/ftnoir_tracker_udp.cpp b/tracker-udp/ftnoir_tracker_udp.cpp index b92ed569..5f95ab5a 100644 --- a/tracker-udp/ftnoir_tracker_udp.cpp +++ b/tracker-udp/ftnoir_tracker_udp.cpp @@ -11,19 +11,19 @@ #include "compat/nan.hpp" #include "compat/util.hpp" -FTNoIR_Tracker::FTNoIR_Tracker() : +udp::udp() : last_recv_pose { 0,0,0, 0,0,0 }, last_recv_pose2 { 0,0,0, 0,0,0 }, should_quit(false) {} -FTNoIR_Tracker::~FTNoIR_Tracker() +udp::~udp() { should_quit = true; wait(); } -void FTNoIR_Tracker::run() +void udp::run() { QByteArray datagram; datagram.resize(sizeof(last_recv_pose)); @@ -67,13 +67,13 @@ void FTNoIR_Tracker::run() } } -void FTNoIR_Tracker::start_tracker(QFrame*) +void udp::start_tracker(QFrame*) { start(); sock.moveToThread(this); } -void FTNoIR_Tracker::data(double *data) +void udp::data(double *data) { QMutexLocker foo(&mutex); for (int i = 0; i < 6; i++) @@ -100,4 +100,4 @@ void FTNoIR_Tracker::data(double *data) } -OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll) +OPENTRACK_DECLARE_TRACKER(udp, dialog_udp, udpDll) diff --git a/tracker-udp/ftnoir_tracker_udp.h b/tracker-udp/ftnoir_tracker_udp.h index b93c5e93..307417b2 100644 --- a/tracker-udp/ftnoir_tracker_udp.h +++ b/tracker-udp/ftnoir_tracker_udp.h @@ -19,11 +19,11 @@ struct settings : opts { {} }; -class FTNoIR_Tracker : public ITracker, protected QThread +class udp : public ITracker, protected QThread { public: - FTNoIR_Tracker(); - ~FTNoIR_Tracker() override; + udp(); + ~udp() override; void start_tracker(QFrame *) override; void data(double *data) override; protected: @@ -36,11 +36,11 @@ private: volatile bool should_quit; }; -class TrackerControls: public ITrackerDialog +class dialog_udp: public ITrackerDialog { Q_OBJECT public: - TrackerControls(); + dialog_udp(); void register_tracker(ITracker *) override {} void unregister_tracker() override {} private: @@ -51,7 +51,7 @@ private slots: void doCancel(); }; -class FTNoIR_TrackerDll : public Metadata +class udpDll : public Metadata { public: QString name() { return QString("UDP sender"); } diff --git a/tracker-udp/ftnoir_tracker_udp_dialog.cpp b/tracker-udp/ftnoir_tracker_udp_dialog.cpp index af94183c..8ed7cb02 100644 --- a/tracker-udp/ftnoir_tracker_udp_dialog.cpp +++ b/tracker-udp/ftnoir_tracker_udp_dialog.cpp @@ -1,7 +1,7 @@ #include "ftnoir_tracker_udp.h" #include "api/plugin-api.hpp" -TrackerControls::TrackerControls() +dialog_udp::dialog_udp() { ui.setupUi( this ); @@ -14,12 +14,12 @@ TrackerControls::TrackerControls() tie_setting(s.add_roll, ui.add_roll); } -void TrackerControls::doOK() { +void dialog_udp::doOK() { s.b->save(); close(); } -void TrackerControls::doCancel() { +void dialog_udp::doCancel() { close(); } -- cgit v1.2.3