use grandfathered convention for class members names and initialise them

paul-szczepanek-arm · paul-szczepanek-arm · commit 1cea53b6a7c3 · 2019-02-14T12:34:34.000Z
diff --git a/features/FEATURE_BLE/ble/GattClient.h b/features/FEATURE_BLE/ble/GattClient.h
@@ -112,7 +112,7 @@ class GattClient {
      */
     void setEventHandler(EventHandler *handler)
     {
-        _eventHandler = handler;
+        eventHandler = handler;
     }
 
     /**
@@ -795,7 +795,7 @@ class GattClient {
     }
 
 protected:
-    GattClient()
+    GattClient() : eventHandler(NULL)
     {
         /* Empty */
     }
@@ -850,7 +850,7 @@ class GattClient {
     /**
      * Event handler provided by the application.
      */
-    EventHandler *_eventHandler;
+    EventHandler *eventHandler;
 
     /**
      * Callchain containing all registered event handlers for data read
diff --git a/features/FEATURE_BLE/ble/GattServer.h b/features/FEATURE_BLE/ble/GattServer.h
@@ -116,7 +116,7 @@ class GattServer {
      */
     void setEventHandler(EventHandler *handler)
     {
-        _eventHandler = handler;
+        eventHandler = handler;
     }
 
     /**
@@ -198,6 +198,7 @@ class GattServer {
     GattServer() :
         serviceCount(0),
         characteristicCount(0),
+        eventHandler(NULL),
         dataSentCallChain(),
         dataWrittenCallChain(),
         dataReadCallChain(),
@@ -813,7 +814,7 @@ class GattServer {
     /**
      * Event handler provided by the application.
      */
-    EventHandler *_eventHandler;
+    EventHandler *eventHandler;
 
     /**
      * The total number of services added to the ATT table.
diff --git a/features/FEATURE_BLE/ble/generic/GenericGattClient.h b/features/FEATURE_BLE/ble/generic/GenericGattClient.h
@@ -37,13 +37,16 @@ class GenericGattClient : public GattClient,
                           public pal::GattClient::EventHandler {
 public:
 
+    /**
+     * @see pal::GattClient::EventHandler::on_att_mtu_change
+     */
     virtual void on_att_mtu_change(
         ble::connection_handle_t connection_handle,
         uint16_t att_mtu_size
     )
     {
-        if (_eventHandler) {
-            _eventHandler->onAttMtuChange(connection_handle, att_mtu_size);
+        if (eventHandler) {
+            eventHandler->onAttMtuChange(connection_handle, att_mtu_size);
         }
     }
 
@@ -140,8 +143,12 @@ class GenericGattClient : public GattClient,
      */
     virtual void set_signing_event_handler(pal::SigningEventMonitor::EventHandler *signing_event_handler);
 
+    /**
+     *  Return the user registered event handler.
+     * @return User registered event handler or NULL if none is present.
+     */
     ::GattClient::EventHandler* getEventHandler() {
-        return _eventHandler;
+        return eventHandler;
     }
 
 private:
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h b/features/FEATURE_BLE/targets/TARGET_CORDIO/CordioGattServer.h
@@ -63,7 +63,7 @@ class GattServer : public ::GattServer,
     static GattServer &getInstance();
 
     ::GattServer::EventHandler* getEventHandler() {
-        return _eventHandler;
+        return eventHandler;
     }
 
     /**
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_MCU_NRF51822/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_MCU_NRF51822/source/nRF5xGattServer.h
@@ -42,7 +42,7 @@ class nRF5xGattServer : public GattServer
     void hwCallback(ble_evt_t *p_ble_evt);
 
     EventHandler* getEventHandler() {
-        return _eventHandler;
+        return eventHandler;
     }
 
 private:
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF51/source/nRF5xGattServer.h
@@ -42,7 +42,7 @@ class nRF5xGattServer : public GattServer
     void hwCallback(const ble_evt_t *p_ble_evt);
 
     EventHandler* getEventHandler() {
-        return _eventHandler;
+        return eventHandler;
     }
 
 private:
diff --git a/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGattServer.h b/features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_SOFTDEVICE/TARGET_NRF52/source/nRF5xGattServer.h
@@ -42,7 +42,7 @@ class nRF5xGattServer : public GattServer
     void hwCallback(const ble_evt_t *p_ble_evt);
 
     EventHandler* getEventHandler() {
-        return _eventHandler;
+        return eventHandler;
     }
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ class GattClient {`
`112`	`112`	`*/`
`113`	`113`	`void setEventHandler(EventHandler *handler)`
`114`	`114`	`{`
`115`		`- _eventHandler = handler;`
	`115`	`+ eventHandler = handler;`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`/**`
`@@ -795,7 +795,7 @@ class GattClient {`
`795`	`795`	`}`
`796`	`796`
`797`	`797`	`protected:`
`798`		`- GattClient()`
	`798`	`+ GattClient() : eventHandler(NULL)`
`799`	`799`	`{`
`800`	`800`	`/* Empty */`
`801`	`801`	`}`
`@@ -850,7 +850,7 @@ class GattClient {`
`850`	`850`	`/**`
`851`	`851`	`* Event handler provided by the application.`
`852`	`852`	`*/`
`853`		`- EventHandler *_eventHandler;`
	`853`	`+ EventHandler *eventHandler;`
`854`	`854`
`855`	`855`	`/**`
`856`	`856`	`* Callchain containing all registered event handlers for data read`
Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,16 @@ class GenericGattClient : public GattClient,`
`37`	`37`	`public pal::GattClient::EventHandler {`
`38`	`38`	`public:`
`39`	`39`
	`40`	`+ /**`
	`41`	`+ * @see pal::GattClient::EventHandler::on_att_mtu_change`
	`42`	`+ */`
`40`	`43`	`virtual void on_att_mtu_change(`
`41`	`44`	`ble::connection_handle_t connection_handle,`
`42`	`45`	`uint16_t att_mtu_size`
`43`	`46`	`)`
`44`	`47`	`{`
`45`		`- if (_eventHandler) {`
`46`		`- _eventHandler->onAttMtuChange(connection_handle, att_mtu_size);`
	`48`	`+ if (eventHandler) {`
	`49`	`+ eventHandler->onAttMtuChange(connection_handle, att_mtu_size);`
`47`	`50`	`}`
`48`	`51`	`}`
`49`	`52`
`@@ -140,8 +143,12 @@ class GenericGattClient : public GattClient,`
`140`	`143`	`*/`
`141`	`144`	`virtual void set_signing_event_handler(pal::SigningEventMonitor::EventHandler *signing_event_handler);`
`142`	`145`
	`146`	`+ /**`
	`147`	`+ * Return the user registered event handler.`
	`148`	`+ * @return User registered event handler or NULL if none is present.`
	`149`	`+ */`
`143`	`150`	`::GattClient::EventHandler* getEventHandler() {`
`144`		`- return _eventHandler;`
	`151`	`+ return eventHandler;`
`145`	`152`	`}`
`146`	`153`
`147`	`154`	`private:`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class GattServer : public ::GattServer,`
`63`	`63`	`static GattServer &getInstance();`
`64`	`64`
`65`	`65`	`::GattServer::EventHandler* getEventHandler() {`
`66`		`- return _eventHandler;`
	`66`	`+ return eventHandler;`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ class nRF5xGattServer : public GattServer`
`42`	`42`	`void hwCallback(ble_evt_t *p_ble_evt);`
`43`	`43`
`44`	`44`	`EventHandler* getEventHandler() {`
`45`		`- return _eventHandler;`
	`45`	`+ return eventHandler;`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`private:`