From aa6db4d5f51e92ad38f2c8541e70e45cd33fe593 Mon Sep 17 00:00:00 2001 From: Todd Treece Date: Mon, 5 Oct 2015 14:18:49 -0400 Subject: [PATCH] rename all subclass diconnect() to disconnectServer() --- Adafruit_MQTT_CC3000.h | 2 +- Adafruit_MQTT_Client.cpp | 2 +- Adafruit_MQTT_Client.h | 2 +- Adafruit_MQTT_FONA.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Adafruit_MQTT_CC3000.h b/Adafruit_MQTT_CC3000.h index a1f6ea6..f064f0c 100644 --- a/Adafruit_MQTT_CC3000.h +++ b/Adafruit_MQTT_CC3000.h @@ -81,7 +81,7 @@ class Adafruit_MQTT_CC3000 : public Adafruit_MQTT { return mqttclient.connected(); } - bool disconnect() { + bool disconnectServer() { if (connected()) { return (mqttclient.close() == 0); } diff --git a/Adafruit_MQTT_Client.cpp b/Adafruit_MQTT_Client.cpp index e0686d9..6612c8f 100644 --- a/Adafruit_MQTT_Client.cpp +++ b/Adafruit_MQTT_Client.cpp @@ -33,7 +33,7 @@ bool Adafruit_MQTT_Client::connectServer() { return r != 0; } -bool Adafruit_MQTT_Client::disconnect() { +bool Adafruit_MQTT_Client::disconnectServer() { // Stop connection if connected and return success (stop has no indication of // failure). if (client->connected()) { diff --git a/Adafruit_MQTT_Client.h b/Adafruit_MQTT_Client.h index e78c81b..416aef2 100644 --- a/Adafruit_MQTT_Client.h +++ b/Adafruit_MQTT_Client.h @@ -43,7 +43,7 @@ class Adafruit_MQTT_Client : public Adafruit_MQTT { {} bool connectServer(); - bool disconnect(); + bool disconnectServer(); bool connected(); uint16_t readPacket(uint8_t *buffer, uint8_t maxlen, int16_t timeout, bool checkForValidPubPacket = false); diff --git a/Adafruit_MQTT_FONA.h b/Adafruit_MQTT_FONA.h index 17d73fe..204d10f 100644 --- a/Adafruit_MQTT_FONA.h +++ b/Adafruit_MQTT_FONA.h @@ -51,7 +51,7 @@ class Adafruit_MQTT_FONA : public Adafruit_MQTT { return fona->TCPconnect(server, portnum); } - bool disconnect() { + bool disconnectServer() { return fona->TCPclose(); }