summaryrefslogtreecommitdiffhomepage
path: root/tracker-hatire
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-12-24 22:45:38 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-12-24 22:45:38 +0100
commit323dd162f5326b998e1c92ab4cfec8a63574023f (patch)
treefb4f0f4f7585d3cb90aef453167c7f4df0c6eeee /tracker-hatire
parent3981f867377ca0652d0cc0ababbbc30208db7e1c (diff)
cmake: decruft, disable deprecated Qt functions
Diffstat (limited to 'tracker-hatire')
-rw-r--r--tracker-hatire/CMakeLists.txt4
-rw-r--r--tracker-hatire/ftnoir_tracker_hat.h12
-rw-r--r--tracker-hatire/thread.cpp1
3 files changed, 8 insertions, 9 deletions
diff --git a/tracker-hatire/CMakeLists.txt b/tracker-hatire/CMakeLists.txt
index 39431724..a73a471c 100644
--- a/tracker-hatire/CMakeLists.txt
+++ b/tracker-hatire/CMakeLists.txt
@@ -1,5 +1,5 @@
if(Qt5SerialPort_FOUND)
otr_module(tracker-hatire)
- target_link_libraries(opentrack-tracker-hatire ${Qt5SerialPort_LIBRARIES})
- target_include_directories(opentrack-tracker-hatire SYSTEM PUBLIC ${Qt5SerialPort_INCLUDE_DIRS})
+ target_link_libraries(${self} ${Qt5SerialPort_LIBRARIES})
+ target_include_directories(${self} SYSTEM PUBLIC ${Qt5SerialPort_INCLUDE_DIRS})
endif()
diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h
index 0f88c7f6..b2300556 100644
--- a/tracker-hatire/ftnoir_tracker_hat.h
+++ b/tracker-hatire/ftnoir_tracker_hat.h
@@ -20,14 +20,14 @@ class hatire : public QObject, public ITracker
public:
hatire();
- ~hatire();
+ ~hatire() override;
- module_status start_tracker(QFrame*);
- void data(double *data);
+ module_status start_tracker(QFrame*) override;
+ void data(double *data) override;
//void center();
//bool notifyZeroed();
void reset();
- void get_info( int *tps );
+ void get_info(int *tps);
void serial_info();
void send_serial_command(const QByteArray& x);
@@ -50,6 +50,6 @@ class hatire_metadata : public Metadata
{
Q_OBJECT
- QString name() { return tr("Hatire Arduino"); }
- QIcon icon() { return QIcon(":/images/hat.png"); }
+ QString name() override { return tr("Hatire Arduino"); }
+ QIcon icon() override { return QIcon(":/images/hat.png"); }
};
diff --git a/tracker-hatire/thread.cpp b/tracker-hatire/thread.cpp
index 4c9574b9..4938e77f 100644
--- a/tracker-hatire/thread.cpp
+++ b/tracker-hatire/thread.cpp
@@ -169,7 +169,6 @@ serial_result hatire_thread::init_serial_port_impl()
&& com_port.setStopBits((QSerialPort::StopBits)s.pStopBits)
&& com_port.setFlowControl((QSerialPort::FlowControl)s.pFlowControl)
&& com_port.clear(QSerialPort::AllDirections)
- && com_port.setDataErrorPolicy(QSerialPort::IgnorePolicy)
)
{
Log(tr("Port Parameters set"));