summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@qt.io>2018-07-24 12:50:33 +0200
committerAlex Blasche <alexander.blasche@qt.io>2018-07-25 11:16:33 +0000
commit8ee3254a18afd3bf06955091e6392570aff15659 (patch)
tree217b24743d7d078942e9f55c883f1a172cb60160
parente84d9f24cbb7c686535cbe7e13f28a1c0baaa48d (diff)
Add override to all overridden QBluetoothSocketPrivate functions
Task-number: QTBUG-68550 Change-Id: Ie8a21d2f239c9aa63635a07e3ff6ee27d2ec4b46 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
-rw-r--r--src/bluetooth/qbluetoothsocket_android_p.h42
-rw-r--r--src/bluetooth/qbluetoothsocket_bluez_p.h40
-rw-r--r--src/bluetooth/qbluetoothsocket_bluezdbus_p.h41
-rw-r--r--src/bluetooth/qbluetoothsocket_p.h40
-rw-r--r--src/bluetooth/qbluetoothsocket_winrt_p.h42
5 files changed, 102 insertions, 103 deletions
diff --git a/src/bluetooth/qbluetoothsocket_android_p.h b/src/bluetooth/qbluetoothsocket_android_p.h
index 14872cde..7bf42e32 100644
--- a/src/bluetooth/qbluetoothsocket_android_p.h
+++ b/src/bluetooth/qbluetoothsocket_android_p.h
@@ -68,49 +68,49 @@ class QBluetoothSocketPrivateAndroid final : public QBluetoothSocketBasePrivate
public:
QBluetoothSocketPrivateAndroid();
- ~QBluetoothSocketPrivateAndroid();
+ ~QBluetoothSocketPrivateAndroid() override;
//On Android we connect using the uuid not the port
void connectToServiceHelper(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothServiceInfo &service,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
bool fallBackConnect(QAndroidJniObject uuid, int channel);
bool fallBackReversedConnect(const QBluetoothUuid &uuid);
- bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
+ bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type) override;
- QString localName() const;
- QBluetoothAddress localAddress() const;
- quint16 localPort() const;
+ QString localName() const override;
+ QBluetoothAddress localAddress() const override;
+ quint16 localPort() const override;
- QString peerName() const;
- QBluetoothAddress peerAddress() const;
- quint16 peerPort() const;
+ QString peerName() const override;
+ QBluetoothAddress peerAddress() const override;
+ quint16 peerPort() const override;
- void abort();
- void close();
+ void abort() override;
+ void close() override;
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) override;
+ qint64 readData(char *data, qint64 maxSize) override;
bool setSocketDescriptor(const QAndroidJniObject &socket, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
- qint64 bytesAvailable() const;
- bool canReadLine() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const override;
+ bool canReadLine() const override;
+ qint64 bytesToWrite() const override;
QAndroidJniObject adapter;
QAndroidJniObject socketObject;
diff --git a/src/bluetooth/qbluetoothsocket_bluez_p.h b/src/bluetooth/qbluetoothsocket_bluez_p.h
index 9aaa56b3..67c04b3d 100644
--- a/src/bluetooth/qbluetoothsocket_bluez_p.h
+++ b/src/bluetooth/qbluetoothsocket_bluez_p.h
@@ -61,42 +61,42 @@ class QBluetoothSocketPrivateBluez final: public QBluetoothSocketBasePrivate
public:
QBluetoothSocketPrivateBluez();
- ~QBluetoothSocketPrivateBluez();
+ ~QBluetoothSocketPrivateBluez() override;
void connectToServiceHelper(const QBluetoothAddress &address,
quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothServiceInfo &service,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
- bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
+ bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type) override;
- QString localName() const;
- QBluetoothAddress localAddress() const;
- quint16 localPort() const;
+ QString localName() const override;
+ QBluetoothAddress localAddress() const override;
+ quint16 localPort() const override;
- QString peerName() const;
- QBluetoothAddress peerAddress() const;
- quint16 peerPort() const;
+ QString peerName() const override;
+ QBluetoothAddress peerAddress() const override;
+ quint16 peerPort() const override;
- void abort();
- void close();
+ void abort() override;
+ void close() override;
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) override;
+ qint64 readData(char *data, qint64 maxSize) override;
bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
- qint64 bytesAvailable() const;
- bool canReadLine() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const override;
+ bool canReadLine() const override;
+ qint64 bytesToWrite() const override;
private slots:
void _q_readNotify();
diff --git a/src/bluetooth/qbluetoothsocket_bluezdbus_p.h b/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
index 3390566d..c7279555 100644
--- a/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
+++ b/src/bluetooth/qbluetoothsocket_bluezdbus_p.h
@@ -61,45 +61,44 @@ class QBluetoothSocketPrivateBluezDBus final: public QBluetoothSocketBasePrivate
public:
QBluetoothSocketPrivateBluezDBus();
- ~QBluetoothSocketPrivateBluezDBus();
+ ~QBluetoothSocketPrivateBluezDBus() override;
void connectToServiceHelper(const QBluetoothAddress &address,
quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothServiceInfo &service,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
- bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
+ bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type) override;
- QString localName() const;
- QBluetoothAddress localAddress() const;
- quint16 localPort() const;
+ QString localName() const override;
+ QBluetoothAddress localAddress() const override;
+ quint16 localPort() const override;
- QString peerName() const;
- QBluetoothAddress peerAddress() const;
- quint16 peerPort() const;
+ QString peerName() const override;
+ QBluetoothAddress peerAddress() const override;
+ quint16 peerPort() const override;
- void abort();
- void close();
+ void abort() override;
+ void close() override;
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) override;
+ qint64 readData(char *data, qint64 maxSize) override;
bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
- qint64 bytesAvailable() const;
- bool canReadLine() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const override;
+ bool canReadLine() const override;
+ qint64 bytesToWrite() const override;
};
-
QT_END_NAMESPACE
#endif // QBLUETOOTHSOCKET_BLUEZDBUS_H
diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_p.h
index f3f46d26..9485977f 100644
--- a/src/bluetooth/qbluetoothsocket_p.h
+++ b/src/bluetooth/qbluetoothsocket_p.h
@@ -64,42 +64,42 @@ class QBluetoothSocketPrivateDummy final : public QBluetoothSocketBasePrivate
public:
QBluetoothSocketPrivateDummy();
- ~QBluetoothSocketPrivateDummy();
+ ~QBluetoothSocketPrivateDummy() override;
void connectToServiceHelper(const QBluetoothAddress &address,
quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothServiceInfo &service,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
- bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
+ bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type) override;
- QString localName() const;
- QBluetoothAddress localAddress() const;
- quint16 localPort() const;
+ QString localName() const override;
+ QBluetoothAddress localAddress() const override;
+ quint16 localPort() const override;
- QString peerName() const;
- QBluetoothAddress peerAddress() const;
- quint16 peerPort() const;
+ QString peerName() const override;
+ QBluetoothAddress peerAddress() const override;
+ quint16 peerPort() const override;
- void abort();
- void close();
+ void abort() override;
+ void close() override;
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) override;
+ qint64 readData(char *data, qint64 maxSize) override;
bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
- qint64 bytesAvailable() const;
- bool canReadLine() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const override;
+ bool canReadLine() const override;
+ qint64 bytesToWrite() const override;
};
QT_END_NAMESPACE
diff --git a/src/bluetooth/qbluetoothsocket_winrt_p.h b/src/bluetooth/qbluetoothsocket_winrt_p.h
index 17f0fa0d..6a740206 100644
--- a/src/bluetooth/qbluetoothsocket_winrt_p.h
+++ b/src/bluetooth/qbluetoothsocket_winrt_p.h
@@ -66,47 +66,47 @@ class QBluetoothSocketPrivateWinRT final: public QBluetoothSocketBasePrivate
public:
QBluetoothSocketPrivateWinRT();
- ~QBluetoothSocketPrivateWinRT();
+ ~QBluetoothSocketPrivateWinRT() override;
void connectToServiceHelper(const QBluetoothAddress &address,
quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothServiceInfo &service,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, const QBluetoothUuid &uuid,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
void connectToService(const QBluetoothAddress &address, quint16 port,
- QIODevice::OpenMode openMode);
+ QIODevice::OpenMode openMode) override;
- bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type);
+ bool ensureNativeSocket(QBluetoothServiceInfo::Protocol type) override;
- QString localName() const;
- QBluetoothAddress localAddress() const;
- quint16 localPort() const;
+ QString localName() const override;
+ QBluetoothAddress localAddress() const override;
+ quint16 localPort() const override;
- QString peerName() const;
- QBluetoothAddress peerAddress() const;
- quint16 peerPort() const;
+ QString peerName() const override;
+ QBluetoothAddress peerAddress() const override;
+ quint16 peerPort() const override;
- void abort();
- void close();
+ void abort() override;
+ void close() override;
- qint64 writeData(const char *data, qint64 maxSize);
- qint64 readData(char *data, qint64 maxSize);
+ qint64 writeData(const char *data, qint64 maxSize) override;
+ qint64 readData(char *data, qint64 maxSize) override;
bool setSocketDescriptor(Microsoft::WRL::ComPtr<ABI::Windows::Networking::Sockets::IStreamSocket> socket,
QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
bool setSocketDescriptor(int socketDescriptor, QBluetoothServiceInfo::Protocol socketType,
QBluetoothSocket::SocketState socketState = QBluetoothSocket::ConnectedState,
- QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite);
+ QBluetoothSocket::OpenMode openMode = QBluetoothSocket::ReadWrite) override;
- qint64 bytesAvailable() const;
- bool canReadLine() const;
- qint64 bytesToWrite() const;
+ qint64 bytesAvailable() const override;
+ bool canReadLine() const override;
+ qint64 bytesToWrite() const override;
SocketWorker *m_worker;