moved begin variants to header

Author: 256dpi

README.md

@@ -110,8 +110,11 @@ void loop() {
 Initialize the object using the hostname of the broker, the brokers port (default: `1883`) and the underlying Client class for network transport:
 
 ```c++
+void begin(Client &client);
 void begin(const char hostname[], Client &client);
 void begin(const char hostname[], int port, Client &client);
+void begin(IPAddress address, Client &client);
+void begin(IPAddress address, int port, Client &client);
 ```
 
 - Specify port `8883` when using secure clients for encrypted connections.
@@ -122,6 +125,8 @@ The hostname and port can also be changed after calling `begin()`:
 ```c++
 void setHost(const char hostname[]);
 void setHost(const char hostname[], int port);
+void setHost(IPAddress address);
+void setHost(IPAddress address, int port);
 ```
 
 Set a will message (last testament) that gets registered on the broker after connecting. `setWill()` has to be called before calling `connect()`:
@@ -171,9 +176,9 @@ void setClockSource(MQTTClientClockSource);
 Connect to broker using the supplied client id and an optional username and password:
 
 ```c++
-bool connect(const char clientId[], bool skip = false);
-bool connect(const char clientId[], const char username[], bool skip = false);
-bool connect(const char clientId[], const char username[], const char password[], bool skip = false);
+bool connect(const char clientID[], bool skip = false);
+bool connect(const char clientID[], const char username[], bool skip = false);
+bool connect(const char clientID[], const char username[], const char password[], bool skip = false);
 ```
 
 - If the `skip` option is set to true, the client will skip the network level connection and jump to the MQTT level connection. This option can be used in order to establish and verify TLS connections manually before giving control to the MQTT client. 

src/MQTTClient.cpp

@@ -140,23 +140,9 @@ MQTTClient::~MQTTClient() {
   free(this->writeBuf);
 }
 
-void MQTTClient::begin(IPAddress ipAddr, int port, Client &client) {
-  // set hostname and port
-  this->setHost(ipAddr, port);
-  // finish up begin() call
-  _begin(port, client);
-}
-
-void MQTTClient::begin(const char hostname[], int port, Client &client) {
-  // set hostname and port
-  this->setHost(hostname, port);
-  // finish up begin() call
-  _begin(port, client);
-}
-
-void MQTTClient::_begin(int port, Client &client){
+void MQTTClient::begin(Client &_client) {
   // set client
-  this->netClient = &client;
+  this->netClient = &_client;
 
   // initialize client
   lwmqtt_init(&this->client, this->writeBuf, this->bufSize, this->readBuf, this->bufSize);
@@ -190,10 +176,9 @@ void MQTTClient::setClockSource(MQTTClientClockSource cb) {
   this->timer2.millis = cb;
 }
 
-void MQTTClient::setHost(IPAddress _ipAddr, int _port) {
-  // set hostname and port
-  this->ipaddress = _ipAddr;
-  
+void MQTTClient::setHost(IPAddress _address, int _port) {
+  // set address and port
+  this->address = _address;
   this->port = _port;
 }
 
@@ -292,7 +277,7 @@ bool MQTTClient::publish(const char topic[], const char payload[], int length, b
   return true;
 }
 
-bool MQTTClient::connect(const char clientId[], const char username[], const char password[], bool skip) {
+bool MQTTClient::connect(const char clientID[], const char username[], const char password[], bool skip) {
   // close left open connection if still connected
   if (!skip && this->connected()) {
     this->close();
@@ -303,13 +288,12 @@ bool MQTTClient::connect(const char clientId[], const char username[], const cha
 
   // connect to host
   if (!skip) {
-	int ret = 0;
-	if(this->hostname != nullptr){
-	  ret = this->netClient->connect(this->hostname, (uint16_t)this->port);
-	}else{
-	  ret = this->netClient->connect(this->ipaddress, (uint16_t)this->port);
-	}
-	
+    int ret;
+    if (this->hostname != nullptr) {
+      ret = this->netClient->connect(this->hostname, (uint16_t)this->port);
+    } else {
+      ret = this->netClient->connect(this->address, (uint16_t)this->port);
+    }
     if (ret <= 0) {
       this->_lastError = LWMQTT_NETWORK_FAILED_CONNECT;
       return false;
@@ -320,7 +304,7 @@ bool MQTTClient::connect(const char clientId[], const char username[], const cha
   lwmqtt_options_t options = lwmqtt_default_options;
   options.keep_alive = this->keepAlive;
   options.clean_session = this->cleanSession;
-  options.client_id = lwmqtt_string(clientId);
+  options.client_id = lwmqtt_string(clientID);
 
   // set username and password if available
   if (username != nullptr) {

src/MQTTClient.h

@@ -43,7 +43,7 @@ class MQTTClient {
 
   Client *netClient = nullptr;
   const char *hostname = nullptr;
-  IPAddress ipaddress;
+  IPAddress address;
   int port = 0;
   lwmqtt_will_t *will = nullptr;
   MQTTClientCallback callback;
@@ -64,11 +64,17 @@ class MQTTClient {
 
   ~MQTTClient();
 
+  void begin(Client &_client);
   void begin(const char _hostname[], Client &_client) { this->begin(_hostname, 1883, _client); }
-  void begin(const char hostname[], int port, Client &client);
-  
-  void begin(IPAddress _ipAddr, Client &client) { this->begin(_ipAddr, 1883, client); }
-  void begin(IPAddress ipAddr, int port, Client &client);
+  void begin(const char _hostname[], int _port, Client &_client) {
+    this->begin(_client);
+    this->setHost(_hostname, _port);
+  }
+  void begin(IPAddress _address, Client &_client) { this->begin(_address, 1883, _client); }
+  void begin(IPAddress _address, int _port, Client &_client) {
+    this->begin(_client);
+    this->setHost(_address, _port);
+  }
 
   void onMessage(MQTTClientCallbackSimple cb);
   void onMessageAdvanced(MQTTClientCallbackAdvanced cb);
@@ -77,9 +83,8 @@ class MQTTClient {
 
   void setHost(const char _hostname[]) { this->setHost(_hostname, 1883); }
   void setHost(const char hostname[], int port);
-  
-  void setHost(IPAddress _ipAddr) { this->setHost(_ipAddr, 1883); }
-  void setHost(IPAddress ipAddr, int port);
+  void setHost(IPAddress _address) { this->setHost(_address, 1883); }
+  void setHost(IPAddress _address, int port);
 
   void setWill(const char topic[]) { this->setWill(topic, ""); }
   void setWill(const char topic[], const char payload[]) { this->setWill(topic, payload, false, 0); }
@@ -95,7 +100,7 @@ class MQTTClient {
   bool connect(const char clientId[], const char username[], bool skip = false) {
     return this->connect(clientId, username, nullptr, skip);
   }
-  bool connect(const char clientId[], const char username[], const char password[], bool skip = false);
+  bool connect(const char clientID[], const char username[], const char password[], bool skip = false);
 
   bool publish(const String &topic) { return this->publish(topic.c_str(), ""); }
   bool publish(const char topic[]) { return this->publish(topic, ""); }
@@ -136,7 +141,6 @@ class MQTTClient {
 
  private:
   void close();
-  void _begin(int port, Client &client);
 };
 
 #endif