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-test/test.cpp | 18 +++++++++--------- tracker-test/test.h | 12 ++++++------ 2 files changed, 15 insertions(+), 15 deletions(-) (limited to 'tracker-test') diff --git a/tracker-test/test.cpp b/tracker-test/test.cpp index 9ffdd366..eba1f603 100644 --- a/tracker-test/test.cpp +++ b/tracker-test/test.cpp @@ -12,22 +12,22 @@ #include -const double FTNoIR_Tracker::incr[6] = +const double test_tracker::incr[6] = { 50, 40, 80, 70, 5, 3 }; -FTNoIR_Tracker::FTNoIR_Tracker() : +test_tracker::test_tracker() : last_x { 0, 0, 0, 0, 0, 0 } { } -FTNoIR_Tracker::~FTNoIR_Tracker() +test_tracker::~test_tracker() { } -void FTNoIR_Tracker::start_tracker(QFrame*) +void test_tracker::start_tracker(QFrame*) { t.start(); } @@ -36,7 +36,7 @@ void FTNoIR_Tracker::start_tracker(QFrame*) # include #endif -void FTNoIR_Tracker::data(double *data) +void test_tracker::data(double *data) { using std::fmod; using std::sin; @@ -77,7 +77,7 @@ void FTNoIR_Tracker::data(double *data) } } -TrackerControls::TrackerControls() +dialog::dialog() { ui.setupUi(this); @@ -85,15 +85,15 @@ TrackerControls::TrackerControls() connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel())); } -void TrackerControls::doOK() +void dialog::doOK() { //s.b->save(); close(); } -void TrackerControls::doCancel() +void dialog::doCancel() { close(); } -OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll) +OPENTRACK_DECLARE_TRACKER(test_tracker, dialog, metadata) diff --git a/tracker-test/test.h b/tracker-test/test.h index acaee67d..5d425b96 100644 --- a/tracker-test/test.h +++ b/tracker-test/test.h @@ -5,11 +5,11 @@ #include -class FTNoIR_Tracker : public ITracker +class test_tracker : public ITracker { public: - FTNoIR_Tracker(); - ~FTNoIR_Tracker() override; + test_tracker(); + ~test_tracker() override; void start_tracker(QFrame *) override; void data(double *data) override; @@ -22,13 +22,13 @@ private: Timer t; }; -class TrackerControls: public ITrackerDialog +class dialog: public ITrackerDialog { Q_OBJECT Ui::test_ui ui; public: - TrackerControls(); + dialog(); void register_tracker(ITracker *) override {} void unregister_tracker() override {} private slots: @@ -36,7 +36,7 @@ private slots: void doCancel(); }; -class FTNoIR_TrackerDll : public Metadata +class metadata : public Metadata { public: QString name() { return QString("Testing - sine wave"); } -- cgit v1.2.3