Index: sources/view/settings/VBluetooth.h =================================================================== diff -u -rf11dd9cd2c07f96d9d939d70ed9c4ce2edef2a9d -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845 --- sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision f11dd9cd2c07f96d9d939d70ed9c4ce2edef2a9d) +++ sources/view/settings/VBluetooth.h (.../VBluetooth.h) (revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845) @@ -21,7 +21,7 @@ #include "main.h" // Doxygen : do not remove #include "VView.h" #include "MAdjustHDSerialNumberResponse.h" -#include "BluetoothInterface.h" +#include "MBluetooth.h" // forward declarations class tst_views; @@ -38,12 +38,14 @@ // friends friend class ::tst_views; + PROPERTY(bool , isInvalid , true ) // chose isInvalid instead of isValid for performance reasons to avoid multi call when it is valid. + PROPERTY(QString , notification , "" ) PROPERTY(QString , localName , "" ) PROPERTY(QString , localAddr , "" ) - PROPERTY(bool , scanEnabled , true ) + PROPERTY(bool , scanEnabled , false ) PROPERTY(QString , deviceName , "" ) PROPERTY(QString , deviceAddr , "" ) PROPERTY(QString , devicePin , "" ) @@ -56,16 +58,20 @@ PROPERTY(QString , detailValue , "" ) VIEW_DEC_CLASS(VBluetooth) - VIEW_DEC_SLOT (AdjustSerialNumberHDResponseData) signals: private slots: - void onStateChange(const Model::MBluetooth &vData); + void onStateChange (const Model::MBluetooth &vData); + QString toText ( Model::MBluetooth::InterfaceStates vState) const; + void notify (Model::MBluetooth::InterfaceStates vState); public slots: - void doScan(); - - + void doScan (); + void doConnectToDevice (); + void doDiscoverServices (); + void doEnableNotify (); + void doReadMeasurements (); + void doReadInformation (); }; }