Index: sources/model/settings/MBluetooth.h
===================================================================
diff -u -r028cb1403e8fcb2d2e9ab2aa1562f660124015b1 -r93cb2e56782aa64aafb2b69ec526a5e49ffdf1c7
--- sources/model/settings/MBluetooth.h	(.../MBluetooth.h)	(revision 028cb1403e8fcb2d2e9ab2aa1562f660124015b1)
+++ sources/model/settings/MBluetooth.h	(.../MBluetooth.h)	(revision 93cb2e56782aa64aafb2b69ec526a5e49ffdf1c7)
@@ -30,71 +30,82 @@
 
 public:
     enum InterfaceStates {
-        eIS_Idle                ,
+        eIS_Idle                    ,
 
-        eIS_Local_Init          ,
-        eIS_Local_Connect       ,
-        eIS_Local_Error_Invalid ,
-        eIS_Local_Error_Off     ,
-        eIS_Local_Error_IO      ,
-        eIS_Local_Error_Unknown ,
-        eIS_Local_Disconnect    ,
+        eIS_Local_Init              ,
+        eIS_Local_Connect           ,
+        eIS_Local_Error_Invalid     ,
+        eIS_Local_Error_Off         ,
+        eIS_Local_Error_IO          ,
+        eIS_Local_Error             ,
+        eIS_Local_Disconnect        ,
 
-        eIS_Scan_Start          ,
-        eIS_Scan_Reject         ,
-        eIS_Scan_NotFound       ,
-        eIS_Scan_Discover       ,
-        eIS_Scan_Found          ,
-        eIS_Scan_Detail         ,
-        eIS_Scan_Stop           ,
-        eIS_Scan_Done           ,
+        eIS_Scan_Start              ,
+        eIS_Scan_Reject             ,
+        eIS_Scan_NotFound           ,
+        eIS_Scan_Discover           ,
+        eIS_Scan_Found              ,
+        eIS_Scan_Stop               ,
+        eIS_Scan_Done               ,
 
-        eIS_Pair_Start          ,
-        eIS_Pair_Error          ,
-        eIS_Pair_PinCode        ,
-        eIS_Pair_Confirm        ,
-        eIS_Pair_Done           ,
+        eIS_Pair_Start              ,
+        eIS_Pair_Error              ,
+        eIS_Pair_PinCode            ,
+        eIS_Pair_Confirm            ,
+        eIS_Pair_Done               ,
 
-        eIS_Device_Init         ,
-        eIS_Device_Start        ,
-        eIS_Device_Connect      ,
-        eIS_Device_Error_Init   ,
-        eIS_Device_Error        ,
-        // eIS_Device_State        ,
-        // eIS_Device_Update       ,
-        eIS_Device_Done         ,
-        eIS_Device_Disconnect   ,
+        eIS_Device_Init             ,
+        eIS_Device_Start            ,
+        eIS_Device_Connect          ,
+        eIS_Device_Error_Init       ,
+        eIS_Device_Error            ,
+        eIS_Device_Done             ,
+        eIS_Device_Disconnect       ,
 
-        eIS_Service_Start       ,
-        eIS_Service_Error       ,
-        eIS_Service_Discover    ,
-        eIS_Service_Done        ,
+        eIS_Service_Start           ,
+        eIS_Service_Error           ,
+        eIS_Service_Discover        ,
+        eIS_Service_Detail          ,
+        eIS_Service_Detail_Invalid  ,
+        eIS_Service_Detail_Error    ,
+        eIS_Service_Detail_Done     ,
+        eIS_Service_Done            ,
 
-        eIS_Close               ,
+        eIS_Close                   ,
     };
     Q_ENUM(InterfaceStates)
 
-    InterfaceStates state       ;
-    QString         localAddr   ;
-    QString         localName   ;
-    QString         deviceAddr  ;
-    QString         deviceName  ;
-    QString         devicePin   ;
-    quint8          devicePair  ;
-    qint16          error       ;
-    bool            valid       ;
-    QString         uuid        ;
+    InterfaceStates state           ;
+    QString         localAddr       = "";
+    QString         localName       = "";
+    QString         deviceAddr      = "";
+    QString         deviceName      = "";
+    QString         devicePin       = "";
+    quint8          devicePair      =  0;
+    qint16          error           =  0;
+    bool            valid           =  1;
+    QString         serviceAddr     = "";
+    QString         serviceName     = "";
 
     MBluetooth(
-    InterfaceStates vState      = eIS_Idle,
-    QString         vDeviceAddr = "",
-    QString         vDeviceName = "",
-    QString         vDevicePin  = "",
-    quint8          vDevicePair =  0,
-    qint16          vError      =  0,
-    bool            vValid      = true,
-    QString         vUUID       = ""
+    InterfaceStates vState          = eIS_Idle,
+    QString         vDeviceAddr     = "",
+    QString         vDeviceName     = "",
+    QString         vDevicePin      = "",
+    quint8          vDevicePair     =  0,
+    qint16          vError          =  0,
+    bool            vValid          =  1,
+    QString         vServiceAddr    = "",
+    QString         vServiceName    = ""
     );
+    MBluetooth(
+    InterfaceStates vState          ,
+    QString         vLocalAddr     ,
+    QString         vLocalName     ,
+    qint16          vError          ,
+    bool            vValid
+    );
+
 };
 }