Migrated std::string to String class

danimtb · Aug 18, 2017 · c27ccdb · c27ccdb
1 parent dcaadc3
commit c27ccdb
Show file tree

Hide file tree

Showing 12 changed files with 108 additions and 109 deletions.
diff --git a/DataManager/DataManager.cpp b/DataManager/DataManager.cpp
@@ -14,16 +14,16 @@ DataManager::DataManager()
                         );
 }
 
-std::string DataManager::get(std::string key)
+String DataManager::get(String key)
 {
     String value;
 
-    Embedis::get(String(key.c_str()), value);
+    Embedis::get(key, value);
 
-    return value.c_str();
+    return value;
 }
 
-void DataManager::set(std::string key, std::string value)
+void DataManager::set(String key, String value)
 {
-    Embedis::set(String(key.c_str()), String(value.c_str()));
+    Embedis::set(key, value);
 }
diff --git a/DataManager/DataManager.h b/DataManager/DataManager.h
@@ -4,8 +4,6 @@
 #include <Arduino.h>
 #include <EEPROM.h>
 
-#include <cstdint>
-#include <string>
 
 #include "Embedis.h"
 #include "spi_flash.h"
@@ -17,9 +15,8 @@ class DataManager
 
 public:
     DataManager();
-    std::string get(std::string key);
-    void set(std::string key, std::string value);
-
+    String get(String key);
+    void set(String key, String value);
 };
 
 #endif
diff --git a/MqttManager/MqttDiscoveryComponent.cpp b/MqttManager/MqttDiscoveryComponent.cpp
@@ -1,11 +1,14 @@
 #include "MqttDiscoveryComponent.h"
 
-MqttDiscoveryComponent::MqttDiscoveryComponent(std::string component, std::string entity_id)
+MqttDiscoveryComponent::MqttDiscoveryComponent(String component, String entity_id)
 {
     this->component = component;
     this->entity_id = entity_id;
 
-    this->setConfigurtionVariables("name", entity_id.replace(entity_id.begin(), entity_id.end(), "_", " "));
+    String name = entity_id;
+    name.replace("_", " ");
+
+    this->setConfigurtionVariables("name", name);
 
     if (component == "light" || component == "switch")
     {
@@ -17,20 +20,20 @@ MqttDiscoveryComponent::MqttDiscoveryComponent(std::string component, std::strin
     }
 }
 
-void MqttDiscoveryComponent::setConfigurtionVariables(std::string configKey, std::string configValue)
+void MqttDiscoveryComponent::setConfigurtionVariables(String configKey, String configValue)
 {
-    if (!configValue.empty())
+    if (configValue.length() != 0)
     {
         m_fields[configKey] = configValue;
     }
 }
 
-std::string MqttDiscoveryComponent::getConfigTopic()
+String MqttDiscoveryComponent::getConfigTopic()
 {
     return discovery_prefix + "/" + component + "/" + entity_id + "/" + discovery_suffix;
 }
 
-std::string MqttDiscoveryComponent::getStateTopic()
+String MqttDiscoveryComponent::getStateTopic()
 {
     if (m_fields.find("state_topic") != m_fields.end())
     {
@@ -42,12 +45,12 @@ std::string MqttDiscoveryComponent::getStateTopic()
     }
 }
 
-std::string MqttDiscoveryComponent::getCommandTopic()
+String MqttDiscoveryComponent::getCommandTopic()
 {
     return m_fields["command_topic"];
 }
 
-std::string MqttDiscoveryComponent::getConfigPayload()
+String MqttDiscoveryComponent::getConfigPayload()
 {
     DynamicJsonBuffer jsonBuffer;
     JsonObject& jsonObject = jsonBuffer.createObject();

diff --git a/MqttManager/MqttDiscoveryComponent.h b/MqttManager/MqttDiscoveryComponent.h
@@ -10,24 +10,24 @@
 class MqttDiscoveryComponent
 {
 private:
-    std::map<std::string, std::string> m_fields;
+    std::map<String, String> m_fields;
 
 public:
-    MqttDiscoveryComponent(std::string component, std::string entity_id);
-    void setConfigurtionVariables(std::string configKey, std::string configValue);
+    MqttDiscoveryComponent(String component, String entity_id);
+    void setConfigurtionVariables(String configKey, String configValue);
 
-    std::string discovery_prefix{"homeassistant"};
-    std::string component;
-    std::string entity_id;
-    std::string discovery_suffix{"config"};
-    std::string state_suffix{"state"};
-    std::string command_suffix{"command"};
+    String discovery_prefix{"homeassistant"};
+    String component;
+    String entity_id;
+    String discovery_suffix{"config"};
+    String state_suffix{"state"};
+    String command_suffix{"command"};
 
 
-    std::string getConfigTopic();
-    std::string getStateTopic();
-    std::string getCommandTopic();
-    std::string getConfigPayload();
+    String getConfigTopic();
+    String getStateTopic();
+    String getCommandTopic();
+    String getConfigPayload();
 };
 
 #endif
diff --git a/MqttManager/MqttManager.cpp b/MqttManager/MqttManager.cpp
@@ -2,7 +2,7 @@
 
 #include "ArduinoJson.h"
 
-void (*messageReceivedCallback)(std::string , std::string);
+void (*messageReceivedCallback)(String, String);
 
 void onMqttMessage(char* topic, char* payload, AsyncMqttClientMessageProperties properties, size_t len, size_t index, size_t total)
 {
@@ -22,7 +22,7 @@ MqttManager::MqttManager()
     m_checkConnectivityTimer.setup(RT_ON, m_checkConnectivityTimeOffline);
 }
 
-void MqttManager::setup(std::string mqttServer, std::string mqttPort, std::string mqttUsername, std::string mqttPassword, bool mqttDiscoveryEnabled)
+void MqttManager::setup(String mqttServer, String mqttPort, String mqttUsername, String mqttPassword, bool mqttDiscoveryEnabled)
 {
     m_mqttServer = mqttServer;
     m_mqttPort = atoi(mqttPort.c_str());
@@ -43,7 +43,7 @@ void MqttManager::setup(std::string mqttServer, std::string mqttPort, std::strin
     m_checkConnectivityTimer.start();
 }
 
-void MqttManager::setDeviceData(std::string deviceName, std::string hardware, std::string deviceIP, std::string firmware, std::string firmwareVersion)
+void MqttManager::setDeviceData(String deviceName, String hardware, String deviceIP, String firmware, String firmwareVersion)
 {
     m_deviceName = deviceName;
     m_deviceIP = deviceIP;
@@ -106,7 +106,7 @@ void MqttManager::publishDeviceStatusInfo()
 
         deviceDataObject.printTo(deviceDataString);
 
-        this->publishMQTT(m_deviceDataTopic, deviceDataString.c_str());
+        this->publishMQTT(m_deviceDataTopic, deviceDataString);
     }
     else
     {
@@ -150,9 +150,9 @@ void MqttManager::checkConnectivity()
 
 void MqttManager::setDeviceMac()
 {
-    if (m_deviceMac.empty())
+    if (m_deviceMac.length() == 0)
     {
-        m_deviceMac = std::string(WiFi.macAddress().c_str());
+        m_deviceMac = WiFi.macAddress();
     }
 }
 
@@ -169,9 +169,9 @@ void MqttManager::addDiscoveryComponent(MqttDiscoveryComponent * component)
     this->addStatusTopic(component->getStateTopic());
 }
 
-void MqttManager::addStatusTopic(std::string statusTopic)
+void MqttManager::addStatusTopic(String statusTopic)
 {
-    if (!statusTopic.empty())
+    if (statusTopic.length() != 0)
     {
         m_statusTopics[statusTopic] = "";
     }
@@ -182,9 +182,9 @@ void MqttManager::clearStatusTopics()
     m_statusTopics.clear();
 }
 
-void MqttManager::addSubscribeTopic(std::string subscribeTopic)
+void MqttManager::addSubscribeTopic(String subscribeTopic)
 {
-    if (!subscribeTopic.empty())
+    if (subscribeTopic.length() != 0)
     {
         m_subscribeTopics.push_back(subscribeTopic);
     }
@@ -211,7 +211,7 @@ void MqttManager::stopConnection()
     m_checkConnectivityTimer.load(m_checkConnectivityTimeOffline);
 }
 
-void MqttManager::publishMQTT(std::string topic, std::string payload)
+void MqttManager::publishMQTT(String topic, String payload)
 {
     if (m_statusTopics.find(topic) != m_statusTopics.end() && m_statusTopics[topic] != payload)
     {
@@ -228,18 +228,18 @@ void MqttManager::publishMQTT(std::string topic, std::string payload)
     }
 }
 
-void MqttManager::publishMQTT(std::string topic, float payload)
+void MqttManager::publishMQTT(String topic, float payload)
 {
     String output(payload, 1);
     this->publishMQTT(topic, output.c_str());
 }
 
-void MqttManager::setCallback(void (*callback)(std::string , std::string))
+void MqttManager::setCallback(void (*callback)(String , String))
 {
     messageReceivedCallback = callback;
 }
 
-void MqttManager::setLastWillMQTT(std::string topic, const char* payload)
+void MqttManager::setLastWillMQTT(String topic, const char* payload)
 {
     m_mqttClient.setWill(topic.c_str(), 1, true, payload);
 }
@@ -272,7 +272,7 @@ void MqttManager::loop()
 
 void MqttManager::refreshStatusTopics()
 {
-    for (std::map<std::string, std::string>::iterator it = m_statusTopics.begin(); it != m_statusTopics.end(); it++)
+    for (std::map<String, String>::iterator it = m_statusTopics.begin(); it != m_statusTopics.end(); it++)
     {
         m_mqttClient.publish(it->first.c_str(), 1, true, it->second.c_str());
     }

diff --git a/MqttManager/MqttManager.h b/MqttManager/MqttManager.h
@@ -20,19 +20,19 @@
 class MqttManager
 {
 private:
-    std::string m_mqttServer;
+    String m_mqttServer;
     uint16_t m_mqttPort;
-    std::string m_mqttUsername;
-    std::string m_mqttPassword;
+    String m_mqttUsername;
+    String m_mqttPassword;
 
-    std::string m_deviceName;
-    std::string m_deviceIP;
-    std::string m_deviceMac;
-    std::string m_hardware;
-    std::string m_firmware;
-    std::string m_firmwareVersion;
+    String m_deviceName;
+    String m_deviceIP;
+    String m_deviceMac;
+    String m_hardware;
+    String m_firmware;
+    String m_firmwareVersion;
 
-    std::string m_deviceDataTopic;
+    String m_deviceDataTopic;
 
     MqttDiscoveryComponent* m_deviceNameSensor;
     MqttDiscoveryComponent* m_deviceIpSensor;
@@ -41,8 +41,8 @@ class MqttManager
     MqttDiscoveryComponent* m_deviceFirmwareSensor;
     MqttDiscoveryComponent* m_deviceFirmwareVersionSensor;
 
-    std::map<std::string, std::string> m_statusTopics;
-    std::vector<std::string> m_subscribeTopics;
+    std::map<String, String> m_statusTopics;
+    std::vector<String> m_subscribeTopics;
     std::vector<MqttDiscoveryComponent*> m_discoveryComponents;
 
     AsyncMqttClient m_mqttClient;
@@ -64,28 +64,28 @@ class MqttManager
 public:
     MqttManager();
 
-    void setup(std::string mqttServer, std::string mqttPort, std::string mqttUsername, std::string mqttPassword, bool mqttDiscoveryEnabled = false);
+    void setup(String mqttServer, String mqttPort, String mqttUsername, String mqttPassword, bool mqttDiscoveryEnabled = false);
 
-    void setDeviceData(std::string deviceName, std::string hardware, std::string deviceIP, std::string firmware, std::string firmwareVersion);
-    void setCallback(void (*callback)(std::string , std::string));
-    void setLastWillMQTT(std::string topic, const char* payload);
+    void setDeviceData(String deviceName, String hardware, String deviceIP, String firmware, String firmwareVersion);
+    void setCallback(void (*callback)(String , String));
+    void setLastWillMQTT(String topic, const char* payload);
 
     void setDeviceStatusInfoTime(unsigned long deviceStatusInfoTime);
 
     void enableDiscovery(bool enable);
     void addDiscoveryComponent(MqttDiscoveryComponent* component);
 
-    void addSubscribeTopic(std::string subscribeTopic);
+    void addSubscribeTopic(String subscribeTopic);
     void clearSubscribeTopics();
 
-    void addStatusTopic(std::string statusTopic);
+    void addStatusTopic(String statusTopic);
     void clearStatusTopics();
 
     void startConnection();
     void stopConnection();
 
-    void publishMQTT(std::string topic, std::string payload);
-    void publishMQTT(std::string topic, float payload);
+    void publishMQTT(String topic, String payload);
+    void publishMQTT(String topic, float payload);
 
     bool connected();