From fa39fcbca6cea7f4cbdfaf62429053cba3061ef8 Mon Sep 17 00:00:00 2001 From: Claudiu Olteanu Date: Sat, 19 Sep 2015 19:31:21 +0300 Subject: [PATCH 2/2] Rename BTH_ADDR_STR_LEN macro Signed-off-by: Claudiu Olteanu --- qt-ui/btdeviceselectiondialog.cpp | 4 ++-- qt-ui/btdeviceselectiondialog.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt-ui/btdeviceselectiondialog.cpp b/qt-ui/btdeviceselectiondialog.cpp index 40d5731..2fa8ef1 100644 --- a/qt-ui/btdeviceselectiondialog.cpp +++ b/qt-ui/btdeviceselectiondialog.cpp @@ -588,8 +588,8 @@ void WinBluetoothDeviceDiscoveryAgent::run() if (result == SUCCESS) { // Found a device - QString deviceAddress(BTH_ADDR_STR_LEN, Qt::Uninitialized); - DWORD addressSize = BTH_ADDR_STR_LEN; + QString deviceAddress(BTH_ADDR_BUF_LEN, Qt::Uninitialized); + DWORD addressSize = BTH_ADDR_BUF_LEN; // Collect the address of the device from the WSAQUERYSET SOCKADDR_BTH *socketBthAddress = (SOCKADDR_BTH *) pResults->lpcsaBuffer->RemoteAddr.lpSockaddr; diff --git a/qt-ui/btdeviceselectiondialog.h b/qt-ui/btdeviceselectiondialog.h index d947d34..a99afb8 100644 --- a/qt-ui/btdeviceselectiondialog.h +++ b/qt-ui/btdeviceselectiondialog.h @@ -14,7 +14,7 @@ #include #define SUCCESS 0 - #define BTH_ADDR_STR_LEN 40 + #define BTH_ADDR_BUF_LEN 40 #define BTH_ADDR_PRETTY_STRING_LEN 17 // there are 6 two-digit hex values and 5 colons #undef ERROR // this is already declared in our headers -- 2.4.3