Diff: btle/btle_discovery.h

Revision:

305:293634834813

Parent:

304:8677dcdb218d

Child:

306:76e2e7349319

--- a/btle/btle_discovery.h	Fri Jun 19 15:55:29 2015 +0100
+++ b/btle/btle_discovery.h	Fri Jun 19 15:55:29 2015 +0100
@@ -40,7 +40,7 @@
                                state(INACTIVE),
                                services(),
                                characteristics(),
-                               serviceIndicesNeedingUUIDDiscovery(this),
+                               serviceUUIDDiscoveryQueue(this),
                                onTerminationCallback(NULL) {
         /* empty */
     }
@@ -112,9 +112,9 @@
      * A datatype to contain service-indices for which long UUIDs need to be
      * discovered using read_val_by_uuid().
      */
-    class ServiceIndicesNeedingUUIDDiscovery {
+    class ServiceUUIDDiscoveryQueue {
     public:
-        ServiceIndicesNeedingUUIDDiscovery(NordicServiceDiscovery *parent) :
+        ServiceUUIDDiscoveryQueue(NordicServiceDiscovery *parent) :
             numIndices(0),
             serviceIndices(),
             parentDiscoveryObject(parent) {
@@ -165,7 +165,7 @@
 
         NordicServiceDiscovery *parentDiscoveryObject;
     };
-    friend class ServiceIndicesNeedingUUIDDiscovery;
+    friend class ServiceUUIDDiscoveryQueue;
 
 private:
     friend void bleGattcEventHandler(const ble_evt_t *p_ble_evt);
@@ -189,7 +189,7 @@
                                                                    *  This is intended for internal use during service discovery. */
     DiscoveredCharacteristic characteristics[BLE_DB_DISCOVERY_MAX_CHAR_PER_SRV];
 
-    ServiceIndicesNeedingUUIDDiscovery serviceIndicesNeedingUUIDDiscovery;
+    ServiceUUIDDiscoveryQueue serviceUUIDDiscoveryQueue;
 
     TerminationCallback_t onTerminationCallback;
 };