Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r1d006f4e732fa2c5335d5adff425d0f39a99d37c -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 1d006f4e732fa2c5335d5adff425d0f39a99d37c) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -9,17 +9,20 @@ VBluetooth::VBluetooth(QObject *parent) : QObject(parent) { - connect(&_BLEScanner, SIGNAL(scanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error)), + connect(&_BLEScanner, SIGNAL(didReceiveScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error)), this, SLOT(onScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error))); - connect(&_BLEScanner, SIGNAL(scanFinished()), + connect(&_BLEScanner, SIGNAL(didFinishScan()), this, SLOT(onScanForDevicesFinished())); - connect(&_BLEScanner, SIGNAL(deviceDiscovered(const QBluetoothDeviceInfo)), + connect(&_BLEScanner, SIGNAL(didDiscoverDevice(QBluetoothDeviceInfo)), this, SLOT(onDeviceDiscovered(const QBluetoothDeviceInfo))); - connect(this, SIGNAL(selectedDevice(const QString)), + connect(this, SIGNAL(didSelectDevice(const QString)), &_BLEScanner, SLOT(doSelectDevice(const QString))); + + connect(this, SIGNAL(didRequestScanForDevices()), + &_BLEScanner, SLOT(doScanForDevices())); } /*! @@ -31,10 +34,10 @@ void VBluetooth::doScanForDevices() { bleDevices.clear(); - emit devicesChanged(); - _BLEScanner.scanForDevices(); + emit didDevicesChanged(); + emit didRequestScanForDevices(); status = "Scanning..."; - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -53,7 +56,7 @@ status = tr("Error: Scan for devices error."); break; } - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -66,7 +69,7 @@ VBluetoothDeviceInfo *info = new VBluetoothDeviceInfo(device); bleDevices.append(info); qDebug() << "VBluetooth: Discovered " << device.address(); - emit devicesChanged(); + emit didDevicesChanged(); } /*! @@ -75,9 +78,9 @@ */ void VBluetooth::onScanForDevicesFinished() { - emit scanFinished(); + emit didScanFinished(); status = "Scan Finished."; - emit statusChanged(); + emit didStatusChanged(); } /*! @@ -97,6 +100,6 @@ */ void VBluetooth::doSelectDevice(const QString &addr) { - emit selectedDevice(addr); + emit didSelectDevice(addr); }