cleanup: remove all "using std" from codebase

facchinm · facchinm · commit 18b9df3bfbbc · 2023-06-12T17:38:59.000+02:00
diff --git a/libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino b/libraries/ESPhost/examples/ESP32_TEST/ESP32_TEST.ino
@@ -2,8 +2,6 @@
 #include "CNetIf.h"
 #include <string>
 
-using namespace std;
-
 /* GPIO_LOCAL C33 
    - 0. P010 
    - 1. P207
diff --git a/libraries/ESPhost/src/CCtrlWrapper.h b/libraries/ESPhost/src/CCtrlWrapper.h
@@ -28,8 +28,6 @@
 
 #include <vector>
 
-using namespace std;
-
 #include "esp_hosted_config.pb-c.h"
 
 #include "CMsg.h"
@@ -989,7 +987,7 @@ class CCtrlMsgWrapper {
    }
    
    /* ----------------------------------------------------------------------- */
-   int extractSoftConnectedStationList(vector<WifiConnectedSta_t>& l) {
+   int extractSoftConnectedStationList(std::vector<WifiConnectedSta_t>& l) {
    /* ----------------------------------------------------------------------- */   
       
       if(checkResponsePayload<CtrlMsgRespSoftAPConnectedSTA>(answer, 
@@ -1113,7 +1111,7 @@ class CCtrlMsgWrapper {
 
 
    /* ----------------------------------------------------------------------- */
-   int extractAccessPointList(vector<AccessPoint_t>& l) {
+   int extractAccessPointList(std::vector<AccessPoint_t>& l) {
    /* ----------------------------------------------------------------------- */
       
       if(checkResponsePayload<CtrlMsgRespScanResult>(answer, 
diff --git a/libraries/ESPhost/src/CEspCommunication.cpp b/libraries/ESPhost/src/CEspCommunication.cpp
@@ -20,10 +20,10 @@
 
 #include "CEspCommunication.h"
 
-queue<CMsg> CEspCom::to_ESP32_queue;
-queue<CMsg> CEspCom::from_ESP32_queue;
-queue<CMsg> CEspCom::rxStationQueue;
-queue<CMsg> CEspCom::rxSoftApQueue;
+std::queue<CMsg> CEspCom::to_ESP32_queue;
+std::queue<CMsg> CEspCom::from_ESP32_queue;
+std::queue<CMsg> CEspCom::rxStationQueue;
+std::queue<CMsg> CEspCom::rxSoftApQueue;
 /* -------------------------------------------------------------------------- */
 bool CEspCom::send_msg_to_esp(CMsg &msg) {
 /* -------------------------------------------------------------------------- */  
diff --git a/libraries/ESPhost/src/CEspCommunication.h b/libraries/ESPhost/src/CEspCommunication.h
@@ -30,14 +30,12 @@
 #include <queue>
 #include "CMsg.h"
 
-using namespace std;
-
 class CEspCom {
 private:
-   static queue<CMsg> to_ESP32_queue;
-   static queue<CMsg> from_ESP32_queue;
-   static queue<CMsg> rxStationQueue;
-   static queue<CMsg> rxSoftApQueue;
+   static std::queue<CMsg> to_ESP32_queue;
+   static std::queue<CMsg> from_ESP32_queue;
+   static std::queue<CMsg> rxStationQueue;
+   static std::queue<CMsg> rxSoftApQueue;
 public:
    /* application layer call this function when wants to send a message to esp*/
    static bool send_msg_to_esp(CMsg &msg);
diff --git a/libraries/ESPhost/src/CEspControl.cpp b/libraries/ESPhost/src/CEspControl.cpp
@@ -602,7 +602,7 @@ int CEspControl::setWifiMode(WifiMode_t mode, EspCallback_f cb) {
 /* -------------------------------------------------------------------------- */
 /* GET ACCESS POINT SCAN LIST: see GENERAL NOTE ABOUT THE REQUEST function structure above*/
 /* -------------------------------------------------------------------------- */
-int CEspControl::getAccessPointScanList(vector<AccessPoint_t>& l, EspCallback_f cb) {
+int CEspControl::getAccessPointScanList(std::vector<AccessPoint_t>& l, EspCallback_f cb) {
    #ifdef ESP_HOST_DEBUG_ENABLED
    Serial.println("[REQUEST] CEspControl::getAccessPointScanList");
    #endif
@@ -828,7 +828,7 @@ int CEspControl::getSoftAccessPointConfig(SoftApCfg_t &sap_cfg, EspCallback_f cb
 /* -------------------------------------------------------------------------- */
 /* GET SOFT CONNECTED STATION LIST: see GENERAL NOTE ABOUT THE REQUEST function structure above */
 /* -------------------------------------------------------------------------- */
-int CEspControl::getSoftConnectedStationList(vector<WifiConnectedSta_t>& l, EspCallback_f cb) {
+int CEspControl::getSoftConnectedStationList(std::vector<WifiConnectedSta_t>& l, EspCallback_f cb) {
    #ifdef ESP_HOST_DEBUG_ENABLED
    Serial.println("[REQUEST] CEspControl::getSoftConnectedStationList");
    #endif
diff --git a/libraries/ESPhost/src/CEspControl.h b/libraries/ESPhost/src/CEspControl.h
@@ -64,7 +64,7 @@ class CNetUtilities {
    }
 
    static void macArray2macStr(char *mac_out, const uint8_t *mac_in) {
-      string MAC = "";
+      std::string MAC = "";
       for(int i = 0; i < WIFI_MAC_ADDRESS_DIM; i++) {
          MAC += std::to_string(*(mac_in + i));
          if(i < WIFI_MAC_ADDRESS_DIM - 1) {
@@ -105,14 +105,14 @@ class CEspControl {
    int getWifiMode(WifiMode_t &mode, EspCallback_f cb = nullptr);
    int setWifiMode(WifiMode_t mode, EspCallback_f cb = nullptr);
 
-   int getAccessPointScanList(vector<AccessPoint_t>& l, EspCallback_f cb = nullptr);
+   int getAccessPointScanList(std::vector<AccessPoint_t>& l, EspCallback_f cb = nullptr);
 
    int connectAccessPoint(WifiApCfg_t &ap_cfg, EspCallback_f cb = nullptr);
    int getAccessPointConfig(WifiApCfg_t &ap, EspCallback_f cb = nullptr);
    int disconnectAccessPoint(EspCallback_f cb = nullptr);
 
    int getSoftAccessPointConfig(SoftApCfg_t &sap_cfg, EspCallback_f cb = nullptr);
-   int getSoftConnectedStationList(vector<WifiConnectedSta_t>& l, EspCallback_f cb = nullptr);
+   int getSoftConnectedStationList(std::vector<WifiConnectedSta_t>& l, EspCallback_f cb = nullptr);
    int setSoftAccessPointVndIe(WifiVendorSoftApIe_t &vendor_ie, EspCallback_f cb = nullptr);
    int startSoftAccessPoint(SoftApCfg_t &cfg, EspCallback_f cb = nullptr);
    int stopSoftAccessPoint(EspCallback_f cb = nullptr);
diff --git a/libraries/WiFiS3/src/Modem.h b/libraries/WiFiS3/src/Modem.h
@@ -14,8 +14,6 @@
 
 #define DO_NOT_CHECK_CMD "NO_CMD_CHECK"
 
-using namespace std;
-
 class ModemClass {
 
 public:
diff --git a/libraries/WiFiS3/src/StringHelpers.h b/libraries/WiFiS3/src/StringHelpers.h
@@ -5,8 +5,6 @@
 #include <vector>
 #include <algorithm>
 
-using namespace std;
-
 void ltrim(std::string &s);
 
 // trim from end (in place)
diff --git a/libraries/WiFiS3/src/WiFi.h b/libraries/WiFiS3/src/WiFi.h
@@ -9,8 +9,6 @@
 #include "Modem.h"
 
 
-using namespace std;
-
 #define DEFAULT_IP_AP_ADDRESS           IPAddress(192,168,4,1)
 #define DEFAULT_GW_AP_ADDRESS           IPAddress(192,168,1,1)
 #define DEFAULT_NM_AP_ADDRESS           IPAddress(255,255,255,0)
diff --git a/libraries/lwIpWrapper/src/CNetIf.cpp b/libraries/lwIpWrapper/src/CNetIf.cpp
@@ -9,7 +9,7 @@ CNetIf* CLwipIf::net_ifs[] = { nullptr };
 bool CLwipIf::wifi_hw_initialized = false;
 bool CLwipIf::connected_to_access_point = false;
 WifiStatus_t CLwipIf::wifi_status = WL_IDLE_STATUS;
-queue<struct pbuf*> CLwipIf::eth_queue;
+std::queue<struct pbuf*> CLwipIf::eth_queue;
 bool CLwipIf::pending_eth_rx = false;
 
 FspTimer CLwipIf::timer;
diff --git a/libraries/lwIpWrapper/src/CNetIf.h b/libraries/lwIpWrapper/src/CNetIf.h
@@ -93,8 +93,6 @@ typedef enum {
 #define MAX_DHCP_TRIES 4
 #define TIMEOUT_DNS_REQUEST 10000U
 
-using namespace std;
-
 class CNetIf;
 
 using NetIfRxCb_f = int (*)(CNetIf*);
@@ -276,7 +274,7 @@ class CWifiSoftAp : public CNetIf {
 class CLwipIf {
     /* -------------------------------------------------------------------------- */
 private:
-    static queue<struct pbuf*> eth_queue;
+    static std::queue<struct pbuf*> eth_queue;
 
     bool eth_initialized;
 
@@ -296,7 +294,7 @@ class CLwipIf {
     static void timer_cb(timer_callback_args_t* arg);
 #endif
 
-    vector<AccessPoint_t> access_points;
+    std::vector<AccessPoint_t> access_points;
     WifiApCfg_t access_point_cfg;
 
     SoftApCfg_t soft_ap_cfg;
