Index: sources/view/VBluetooth.cpp =================================================================== diff -u -r510ea07f96362a18f9961f41b5b91740df075c1f -r757a01c42a7a611704a67869a74c68f53edab20f --- sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 510ea07f96362a18f9961f41b5b91740df075c1f) +++ sources/view/VBluetooth.cpp (.../VBluetooth.cpp) (revision 757a01c42a7a611704a67869a74c68f53edab20f) @@ -59,7 +59,7 @@ */ void VBluetooth::doScanForDevices() { - onUpdateStatus(tr("Scanning...")); + notifyStatusUpdate(tr("Scanning...")); _unpairedDevices.clear(); emit didDevicesChanged(); emit didRequestScanForDevices(); @@ -75,10 +75,10 @@ { switch (error) { case QBluetoothDeviceDiscoveryAgent::PoweredOffError: - onUpdateStatus(tr("Error: Bluetooth module is powered off.")); + notifyStatusUpdate(tr("Error: Bluetooth module is powered off.")); break; default: - onUpdateStatus(tr("Error: Scan for devices error.")); + notifyStatusUpdate(tr("Error: Scan for devices error.")); break; } } @@ -104,7 +104,7 @@ void VBluetooth::onScanForDevicesFinished() { emit didScanFinished(); - onUpdateStatus(tr("Scan Finished.")); + notifyStatusUpdate(tr("Scan Finished.")); } /*! @@ -146,11 +146,11 @@ } /*! - * \brief onUpdateStatus + * \brief notifyStatusUpdate * Updates the status and emits a signal to notify the QML * \param message */ -void VBluetooth::onUpdateStatus(const QString &message) +void VBluetooth::notifyStatusUpdate(const QString &message) { _status = message; emit didStatusChanged(); @@ -162,7 +162,7 @@ */ void VBluetooth::onConnectingToDevice() { - onUpdateStatus(tr("Connecting...")); + notifyStatusUpdate(tr("Connecting...")); } /*! @@ -215,7 +215,7 @@ */ void VBluetooth::onControllerError(QLowEnergyController::Error error) { - onUpdateStatus(controllerErrorToString(error)); + notifyStatusUpdate(controllerErrorToString(error)); } /*! @@ -276,7 +276,7 @@ removeFromDevices(info); } - onUpdateStatus(tr("Paired, Connected.")); + notifyStatusUpdate(tr("Paired, Connected.")); } /*! @@ -314,7 +314,7 @@ { setDeviceConnected(deviceInfo, false); emit didPairedDevicesChanged(); - onUpdateStatus(tr("Paired, Not Connected.")); + notifyStatusUpdate(tr("Paired, Not Connected.")); } /*!