Adding keyword override to allow compiler check if really a base class function is overwritten

Author: aentinger

src/Arduino_NBConnectionHandler.cpp

@@ -69,17 +69,6 @@ NBConnectionHandler::NBConnectionHandler(char const * pin, char const * apn, cha
    PUBLIC MEMBER FUNCTIONS
  ******************************************************************************/
 
-void NBConnectionHandler::init() {
-  char msgBuffer[120];
-  if (_nb.begin(_pin, _apn, _login, _pass) == NB_READY) {
-    Debug.print(DBG_INFO, "SIM card ok");
-    _nb.setTimeout(CHECK_INTERVAL_RETRYING);
-    changeConnectionState(NetworkConnectionState::CONNECTING);
-  } else {
-    Debug.print(DBG_ERROR, "SIM not present or wrong PIN");
-  }
-}
-
 unsigned long NBConnectionHandler::getTime() {
   return _nb.getTime();
 }
@@ -90,9 +79,15 @@ NetworkConnectionState NBConnectionHandler::check() {
   if (now - lastConnectionTickTime > connectionTickTimeInterval) {
     switch (_netConnectionState) {
       case NetworkConnectionState::INIT: {
-          init();
+        if (_nb.begin(_pin, _apn, _login, _pass) == NB_READY) {
+          Debug.print(DBG_INFO, "SIM card ok");
+          _nb.setTimeout(CHECK_INTERVAL_RETRYING);
+          changeConnectionState(NetworkConnectionState::CONNECTING);
+        } else {
+          Debug.print(DBG_ERROR, "SIM not present or wrong PIN");
         }
-        break;
+      }
+      break;
 
       case NetworkConnectionState::CONNECTING: {
           // NOTE: Blocking Call when 4th parameter == true

src/Arduino_NBConnectionHandler.h

@@ -36,13 +36,12 @@ class NBConnectionHandler : public ConnectionHandler {
     NBConnectionHandler(char const * pin, char const * apn, bool const keep_alive = true);
     NBConnectionHandler(char const * pin, char const * apn, char const * login, char const * pass, bool const keep_alive = true);
 
-    virtual void init();
-    virtual unsigned long getTime();
-    virtual NetworkConnectionState check();
-    virtual Client & getClient() { return _nb_client; };
-    virtual UDP & getUDP() { return _nb_udp; };
-    virtual void disconnect();
-    virtual void connect();
+    virtual unsigned long getTime() override;
+    virtual NetworkConnectionState check() override;
+    virtual Client & getClient() override { return _nb_client; };
+    virtual UDP & getUDP() override { return _nb_udp; };
+    virtual void disconnect() override;
+    virtual void connect() override;
 
   private: