diff options
author | Eric Lemanissier <eric.lemanissier@gmail.com> | 2018-06-19 13:24:41 +0200 |
---|---|---|
committer | Eric Lemanissier <eric.lemanissier@gmail.com> | 2018-06-25 09:54:22 +0000 |
commit | f1e305a362c759b0781b6dde3dce5f649b47017c (patch) | |
tree | 423d7786a7f8ddd70a71dcd8585c743d42cd7e0e /src/bluetooth/qbluetoothdevicediscoveryagent_p.h | |
parent | d6fb710c0a21fb58a73ff580b08d00e783337bfa (diff) |
win32: inline unnecessary functions in qbluetooth*discoveryagent
by migrating to templated QMetaObject::invokeMethod
Change-Id: I79e2dec7aa81987894a26859648d31da60cf47ee
Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_p.h')
-rw-r--r-- | src/bluetooth/qbluetoothdevicediscoveryagent_p.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h index d60e89fa..cb12352f 100644 --- a/src/bluetooth/qbluetoothdevicediscoveryagent_p.h +++ b/src/bluetooth/qbluetoothdevicediscoveryagent_p.h @@ -83,23 +83,13 @@ QT_END_NAMESPACE QT_BEGIN_NAMESPACE class QThread; -class ThreadWorkerLE : public QObject +class ThreadWorkerDeviceDiscovery : public QObject { Q_OBJECT -public: - Q_INVOKABLE void discover(); signals: void discoveryCompleted(const QVariant res); }; -class ThreadWorkerClassic : public QObject -{ - Q_OBJECT -public: - Q_INVOKABLE void discover(const QVariant &hSearch); -signals: - void discoveryCompleted(const QVariant res); -}; QT_END_NAMESPACE #elif defined(QT_WINRT_BLUETOOTH) @@ -211,8 +201,8 @@ private: QThread *threadLE = nullptr; QThread *threadClassic = nullptr; - ThreadWorkerLE *threadWorkerLE = nullptr; - ThreadWorkerClassic *threadWorkerClassic = nullptr; + ThreadWorkerDeviceDiscovery *threadWorkerLE = nullptr; + ThreadWorkerDeviceDiscovery *threadWorkerClassic = nullptr; #endif #ifdef QT_WINRT_BLUETOOTH |