diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-09-06 07:48:25 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-09-06 07:40:18 +0000 |
| commit | 0075c55a69dc65084e59981193c253d2e5446986 (patch) | |
| tree | 177f151f20eebf4fc143b2f4b55381257297c1af /examples/serialbus/modbus | |
| parent | 61d93606d7fe86fb8782ecb5ea9dd8dd328153a8 (diff) | |
Replace QOverload with C++11 "using TypeId" pattern
It appears QOverload is not quite accepted by all compilers. In
particular OSX 10.11.6 seems to have problems.
Task-number: QTBUG-55747
Change-Id: Idff19ba41836fc7cebb8a837d999189427f30f66
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/serialbus/modbus')
| -rw-r--r-- | examples/serialbus/modbus/adueditor/modbustcpclient_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h index 0ec769a..5161487 100644 --- a/examples/serialbus/modbus/adueditor/modbustcpclient_p.h +++ b/examples/serialbus/modbus/adueditor/modbustcpclient_p.h @@ -85,8 +85,9 @@ public: m_responseTimeoutDuration }; m_transactionStore.insert(m_tId, element); + using TypeId = void (QTimer::*)(int); q->connect(q, &QModbusClient::timeoutChanged, - element.timer.data(), QOverload<int>::of(&QTimer::setInterval)); + element.timer.data(), static_cast<TypeId>(&QTimer::setInterval)); QObject::connect(element.timer.data(), &QTimer::timeout, [this, writeToSocket]() { if (!m_transactionStore.contains(m_tId)) return; |