Replace Q_DECL_OVERRIDE with override

Change-Id: I1c1f2c3cf273cde5030d54901db554cb52e66557
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

7 files changed, 32 insertions, 32 deletions

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
index 9e3f6a57..1318d768 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_osx.mm
@@ -90,7 +90,7 @@ public:
     QBluetoothDeviceDiscoveryAgentPrivate(const QBluetoothAddress & address,
                                           QBluetoothDeviceDiscoveryAgent *q);
 
-    ~QBluetoothDeviceDiscoveryAgentPrivate() Q_DECL_OVERRIDE;
+    ~QBluetoothDeviceDiscoveryAgentPrivate() override;
 
     bool isValid() const;
     bool isActive() const;
@@ -108,9 +108,9 @@ private:
     };
 
     // DeviceInquiryDelegate:
-    void inquiryFinished(IOBluetoothDeviceInquiry *inq) Q_DECL_OVERRIDE;
-    void error(IOBluetoothDeviceInquiry *inq, IOReturn error) Q_DECL_OVERRIDE;
-    void deviceFound(IOBluetoothDeviceInquiry *inq, IOBluetoothDevice *device) Q_DECL_OVERRIDE;
+    void inquiryFinished(IOBluetoothDeviceInquiry *inq) override;
+    void error(IOBluetoothDeviceInquiry *inq, IOReturn error) override;
+    void deviceFound(IOBluetoothDeviceInquiry *inq, IOBluetoothDevice *device) override;
 
     void LEinquiryFinished();
     void LEinquiryError(QBluetoothDeviceDiscoveryAgent::Error error);
diff --git a/src/bluetooth/qbluetoothlocaldevice_osx.mm b/src/bluetooth/qbluetoothlocaldevice_osx.mm
index 45fa310a..8b22f809 100644
--- a/src/bluetooth/qbluetoothlocaldevice_osx.mm
+++ b/src/bluetooth/qbluetoothlocaldevice_osx.mm
@@ -74,18 +74,18 @@ public:
 private:
 
     // PairingDelegate:
-    void connecting(ObjCPairingRequest *pair) Q_DECL_OVERRIDE;
-    void requestPIN(ObjCPairingRequest *pair) Q_DECL_OVERRIDE;
+    void connecting(ObjCPairingRequest *pair) override;
+    void requestPIN(ObjCPairingRequest *pair) override;
     void requestUserConfirmation(ObjCPairingRequest *pair,
-                                 BluetoothNumericValue) Q_DECL_OVERRIDE;
+                                 BluetoothNumericValue) override;
     void passkeyNotification(ObjCPairingRequest *pair,
-                             BluetoothPasskey passkey) Q_DECL_OVERRIDE;
-    void error(ObjCPairingRequest *pair, IOReturn errorCode) Q_DECL_OVERRIDE;
-    void pairingFinished(ObjCPairingRequest *pair) Q_DECL_OVERRIDE;
+                             BluetoothPasskey passkey) override;
+    void error(ObjCPairingRequest *pair, IOReturn errorCode) override;
+    void pairingFinished(ObjCPairingRequest *pair) override;
 
     // ConnectionMonitor
-    void deviceConnected(const QBluetoothAddress &deviceAddress) Q_DECL_OVERRIDE;
-    void deviceDisconnected(const QBluetoothAddress &deviceAddress) Q_DECL_OVERRIDE;
+    void deviceConnected(const QBluetoothAddress &deviceAddress) override;
+    void deviceDisconnected(const QBluetoothAddress &deviceAddress) override;
 
     void emitPairingFinished(const QBluetoothAddress &deviceAddress, Pairing pairing, bool queued);
     void emitError(QBluetoothLocalDevice::Error error, bool queued);
diff --git a/src/bluetooth/qbluetoothserver_osx_p.h b/src/bluetooth/qbluetoothserver_osx_p.h
index 63d0f314..3116ca02 100644
--- a/src/bluetooth/qbluetoothserver_osx_p.h
+++ b/src/bluetooth/qbluetoothserver_osx_p.h
@@ -80,8 +80,8 @@ private:
     void stopListener();
 
     // SocketListener (delegate):
-    void openNotify(IOBluetoothRFCOMMChannel *channel) Q_DECL_OVERRIDE;
-    void openNotify(IOBluetoothL2CAPChannel *channel) Q_DECL_OVERRIDE;
+    void openNotify(IOBluetoothRFCOMMChannel *channel) override;
+    void openNotify(IOBluetoothL2CAPChannel *channel) override;
 
     QBluetoothServiceInfo::Protocol serverType;
     QBluetoothServer *q_ptr;
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
index 25bb2447..f9e4afaf 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
+++ b/src/bluetooth/qbluetoothservicediscoveryagent_osx.mm
@@ -88,8 +88,8 @@ public:
 
 private:
     // SDPInquiryDelegate:
-    void SDPInquiryFinished(IOBluetoothDevice *device) Q_DECL_OVERRIDE;
-    void SDPInquiryError(IOBluetoothDevice *device, IOReturn errorCode) Q_DECL_OVERRIDE;
+    void SDPInquiryFinished(IOBluetoothDevice *device) override;
+    void SDPInquiryError(IOBluetoothDevice *device, IOReturn errorCode) override;
 
     void performMinimalServiceDiscovery(const QBluetoothAddress &deviceAddress);
     void setupDeviceDiscoveryAgent();
diff --git a/src/bluetooth/qbluetoothsocket_osx_p.h b/src/bluetooth/qbluetoothsocket_osx_p.h
index 732d31aa..ce376702 100644
--- a/src/bluetooth/qbluetoothsocket_osx_p.h
+++ b/src/bluetooth/qbluetoothsocket_osx_p.h
@@ -104,7 +104,7 @@ public:
     quint16 peerPort() const;
 
     void _q_readNotify();
-    void _q_writeNotify() Q_DECL_OVERRIDE;
+    void _q_writeNotify() override;
 
 private:
     // Create a socket from an external source (without connectToService).
@@ -112,11 +112,11 @@ private:
     bool setChannel(IOBluetoothL2CAPChannel *channel);
 
     // L2CAP and RFCOMM delegate
-    void setChannelError(IOReturn errorCode) Q_DECL_OVERRIDE;
-    void channelOpenComplete() Q_DECL_OVERRIDE;
-    void channelClosed() Q_DECL_OVERRIDE;
-    void readChannelData(void *data, std::size_t size) Q_DECL_OVERRIDE;
-    void writeComplete() Q_DECL_OVERRIDE;
+    void setChannelError(IOReturn errorCode) override;
+    void channelOpenComplete() override;
+    void channelClosed() override;
+    void readChannelData(void *data, std::size_t size) override;
+    void writeComplete() override;
 
     qint64 writeData(const char *data, qint64 maxSize);
     qint64 readData(char *data, qint64 maxSize);
diff --git a/src/bluetooth/qbluetoothtransferreply_osx.mm b/src/bluetooth/qbluetoothtransferreply_osx.mm
index 02133860..39ec79aa 100644
--- a/src/bluetooth/qbluetoothtransferreply_osx.mm
+++ b/src/bluetooth/qbluetoothtransferreply_osx.mm
@@ -75,14 +75,14 @@ public:
 
 private:
     // OBEX session delegate:
-    void OBEXConnectError(OBEXError errorCode, OBEXOpCode response) Q_DECL_OVERRIDE;
-    void OBEXConnectSuccess() Q_DECL_OVERRIDE;
+    void OBEXConnectError(OBEXError errorCode, OBEXOpCode response) override;
+    void OBEXConnectSuccess() override;
 
-    void OBEXAbortSuccess() Q_DECL_OVERRIDE;
+    void OBEXAbortSuccess() override;
 
-    void OBEXPutDataSent(quint32 current, quint32 total) Q_DECL_OVERRIDE;
-    void OBEXPutSuccess() Q_DECL_OVERRIDE;
-    void OBEXPutError(OBEXError error, OBEXOpCode response) Q_DECL_OVERRIDE;
+    void OBEXPutDataSent(quint32 current, quint32 total) override;
+    void OBEXPutSuccess() override;
+    void OBEXPutError(OBEXError error, OBEXOpCode response) override;
 
     QBluetoothTransferReplyOSX *q_ptr;
 
diff --git a/src/bluetooth/qbluetoothtransferreply_osx_p.h b/src/bluetooth/qbluetoothtransferreply_osx_p.h
index d77d4913..e7b6f683 100644
--- a/src/bluetooth/qbluetoothtransferreply_osx_p.h
+++ b/src/bluetooth/qbluetoothtransferreply_osx_p.h
@@ -73,11 +73,11 @@ public:
                                QBluetoothTransferManager *parent);
     ~QBluetoothTransferReplyOSX();
 
-    TransferError error() const Q_DECL_OVERRIDE;
-    QString errorString() const Q_DECL_OVERRIDE;
+    TransferError error() const override;
+    QString errorString() const override;
 
-    bool isFinished() const Q_DECL_OVERRIDE;
-    bool isRunning() const Q_DECL_OVERRIDE;
+    bool isFinished() const override;
+    bool isRunning() const override;
 
 Q_SIGNALS:
     void error(QBluetoothTransferReply::TransferError lastError);