diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2018-07-24 12:56:55 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2018-07-25 11:16:35 +0000 |
| commit | b19148f9a0f820630bd83432d96117e9598c315d (patch) | |
| tree | 8ac8f0cd544dd39da674657940d6c509ea94721c | |
| parent | 8ee3254a18afd3bf06955091e6392570aff15659 (diff) | |
Rename qbluetoothsocket_p files to qbluetoothsocket_dummy
The new name fits the class better.
Task-number: QTBUG-68550
Change-Id: I7445f48134f8a9fe8b6b6291184f404b3b2faa89
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Lubomir I. Ivanov <neolit123@gmail.com>
| -rw-r--r-- | src/bluetooth/bluetooth.pro | 8 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket.cpp | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_dummy.cpp (renamed from src/bluetooth/qbluetoothsocket_p.cpp) | 2 | ||||
| -rw-r--r-- | src/bluetooth/qbluetoothsocket_dummy_p.h (renamed from src/bluetooth/qbluetoothsocket_p.h) | 6 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro index bff367a8..884dbebf 100644 --- a/src/bluetooth/bluetooth.pro +++ b/src/bluetooth/bluetooth.pro @@ -198,14 +198,14 @@ qtConfig(bluez) { PRIVATE_HEADERS += \ qlowenergycontroller_osx_p.h \ - qbluetoothsocket_p.h + qbluetoothsocket_dummy_p.h include(osx/osxbt.pri) SOURCES += \ qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ - qbluetoothsocket_p.cpp \ + qbluetoothsocket_dummy.cpp \ qbluetoothserver_p.cpp SOURCES -= qbluetoothdevicediscoveryagent.cpp @@ -247,12 +247,12 @@ qtConfig(bluez) { qbluetoothlocaldevice_p.cpp \ qbluetoothserviceinfo_p.cpp \ qbluetoothservicediscoveryagent_p.cpp \ - qbluetoothsocket_p.cpp \ + qbluetoothsocket_dummy.cpp \ qbluetoothserver_p.cpp \ qlowenergycontroller_p.cpp PRIVATE_HEADERS += qlowenergycontroller_p.h \ - qbluetoothsocket_p.h + qbluetoothsocket_dummy_p.h } winrt { diff --git a/src/bluetooth/qbluetoothsocket.cpp b/src/bluetooth/qbluetoothsocket.cpp index 5f54da12..dae844d7 100644 --- a/src/bluetooth/qbluetoothsocket.cpp +++ b/src/bluetooth/qbluetoothsocket.cpp @@ -46,7 +46,7 @@ #elif defined(QT_WINRT_BLUETOOTH) #include "qbluetoothsocket_winrt_p.h" #else -#include "qbluetoothsocket_p.h" +#include "qbluetoothsocket_dummy_p.h" #endif #include "qbluetoothservicediscoveryagent.h" diff --git a/src/bluetooth/qbluetoothsocket_p.cpp b/src/bluetooth/qbluetoothsocket_dummy.cpp index 22f1655b..82da46c2 100644 --- a/src/bluetooth/qbluetoothsocket_p.cpp +++ b/src/bluetooth/qbluetoothsocket_dummy.cpp @@ -38,7 +38,7 @@ ****************************************************************************/ #include "qbluetoothsocket.h" -#include "qbluetoothsocket_p.h" +#include "qbluetoothsocket_dummy_p.h" #ifndef QT_IOS_BLUETOOTH #include "dummy/dummy_helper_p.h" #endif diff --git a/src/bluetooth/qbluetoothsocket_p.h b/src/bluetooth/qbluetoothsocket_dummy_p.h index 9485977f..23bed109 100644 --- a/src/bluetooth/qbluetoothsocket_p.h +++ b/src/bluetooth/qbluetoothsocket_dummy_p.h @@ -37,8 +37,8 @@ ** ****************************************************************************/ -#ifndef QBLUETOOTHSOCKET_P_H -#define QBLUETOOTHSOCKET_P_H +#ifndef QBLUETOOTHSOCKET_DUMMY_H +#define QBLUETOOTHSOCKET_DUMMY_H // // W A R N I N G @@ -102,6 +102,6 @@ public: qint64 bytesToWrite() const override; }; -QT_END_NAMESPACE +QT_END_NAMESPACE // QBLUETOOTHSOCKET_DUMMY_H #endif |