diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-19 17:37:40 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 11:16:18 +0000 |
commit | 40beb226dfe8c23f290d554d5449806e91227f7e (patch) | |
tree | a98a8e24a57bb7a75f0e1230584bf077be519cbd /src/bluetooth/android | |
parent | b20db00c080ff87c5b2a4d1fff2eac7cd694539c (diff) |
Add QBluetoothSocketPrivate interface for Android
Task-number: QTBUG-68550
Change-Id: Iac05cccd4f6e1b44a30568fb9b6c9171204b53fd
Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/bluetooth/android')
-rw-r--r-- | src/bluetooth/android/inputstreamthread.cpp | 4 | ||||
-rw-r--r-- | src/bluetooth/android/inputstreamthread_p.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/android/inputstreamthread.cpp b/src/bluetooth/android/inputstreamthread.cpp index 982c477b..1cc353a3 100644 --- a/src/bluetooth/android/inputstreamthread.cpp +++ b/src/bluetooth/android/inputstreamthread.cpp @@ -42,13 +42,13 @@ #include <QtAndroidExtras/QAndroidJniEnvironment> #include "android/inputstreamthread_p.h" -#include "qbluetoothsocket_p.h" +#include "qbluetoothsocket_android_p.h" QT_BEGIN_NAMESPACE Q_DECLARE_LOGGING_CATEGORY(QT_BT_ANDROID) -InputStreamThread::InputStreamThread(QBluetoothSocketPrivate *socket) +InputStreamThread::InputStreamThread(QBluetoothSocketPrivateAndroid *socket) : QObject(), m_socket_p(socket), expectClosure(false) { } diff --git a/src/bluetooth/android/inputstreamthread_p.h b/src/bluetooth/android/inputstreamthread_p.h index a6ee0655..060b2acf 100644 --- a/src/bluetooth/android/inputstreamthread_p.h +++ b/src/bluetooth/android/inputstreamthread_p.h @@ -59,13 +59,13 @@ QT_BEGIN_NAMESPACE -class QBluetoothSocketPrivate; +class QBluetoothSocketPrivateAndroid; class InputStreamThread : public QObject { Q_OBJECT public: - explicit InputStreamThread(QBluetoothSocketPrivate *socket_p); + explicit InputStreamThread(QBluetoothSocketPrivateAndroid *socket_p); qint64 bytesAvailable() const; bool canReadLine() const; @@ -82,7 +82,7 @@ signals: void error(int errorCode); private: - QBluetoothSocketPrivate *m_socket_p; + QBluetoothSocketPrivateAndroid *m_socket_p; QAndroidJniObject javaInputStreamThread; mutable QMutex m_mutex; bool expectClosure; |