Index: sources/bluetooth/BLEScanner.h =================================================================== diff -u -r0470ff6f209ff0c5089f8f0849b6da04f60f8f41 -r9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e --- sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 0470ff6f209ff0c5089f8f0849b6da04f60f8f41) +++ sources/bluetooth/BLEScanner.h (.../BLEScanner.h) (revision 9efb7cf51c882dc1f374df0b2a8b8c20efafaa4e) @@ -50,9 +50,8 @@ }; typedef bp_measurement bp_measurement_t; - void scanForDevices(); - void parseMeasurement(const QByteArray &byteArray); - void requestBPMeasurement(); + void doParseMeasurement(const QByteArray &byteArray); + void doRequestBPMeasurement(); private: @@ -76,20 +75,21 @@ QStringList characteristicsToAcquireNotify; - void initConnections(); - void quitThread(); - void connectToDevice(const QBluetoothDeviceInfo& deviceInfo); - void setMacAddress(const QString &mac); + void onInitConnections(); + void onQuitThread(); + void onConnectToDevice(const QBluetoothDeviceInfo& deviceInfo); + void onSetMacAddress(const QString &mac); signals: - void receivedBPMeasurement(bp_measurement_t); - void connectedToBloodPressureService(); - void scanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error error); - void scanFinished(); - void deviceDiscovered(const QBluetoothDeviceInfo &device); + void didReceiveBPMeasurement(bp_measurement_t); + void didReceiveScanForDevicesError(QBluetoothDeviceDiscoveryAgent::Error error); + void didFinishScan(); + void didDiscoverDevice(const QBluetoothDeviceInfo &device); public slots: - bool init(); + bool doInit(); + void doSelectDevice(const QString &addr); + void doScanForDevices(); private slots: @@ -106,13 +106,12 @@ void onDeviceDisconnected(); // service slots - void serviceStateChanged(const QLowEnergyService::ServiceState &serviceState); + void onServiceStateChanged(const QLowEnergyService::ServiceState &serviceState); void onCharacteristicChanged(const QLowEnergyCharacteristic &c, const QByteArray &byteArray); - void confirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray); - void serviceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray); + void onConfirmedDescriptorWrite(const QLowEnergyDescriptor &desc, const QByteArray &byteArray); + void onServiceCharacteristicsRead(const QLowEnergyCharacteristic &c,const QByteArray &byteArray); - void quit(); - void onSelectedDevice(const QString &addr); + void onQuit(); }; #endif // BLESCANNER_H