Mitigate possible header conflicts in platformio build system by pref…

…ixing every header with "Nostr"
riccardobl · Jul 30, 2024 · 100cfb5 · 100cfb5
1 parent f1ec4af
commit 100cfb5
Show file tree

Hide file tree

Showing 29 changed files with 45 additions and 45 deletions.
diff --git a/examples/ESP32TestNWC/ESP32TestNWC.cpp b/examples/ESP32TestNWC/ESP32TestNWC.cpp
@@ -3,7 +3,7 @@
 
 #include <Arduino.h>
 
-#include "Transport.h"
+#include "NostrTransport.h"
 #include "services/NWC.h"
 
 // CONFIGURATION

diff --git a/examples/ESP32TestNip01/ESP32TestNip01.cpp b/examples/ESP32TestNip01/ESP32TestNip01.cpp
@@ -5,8 +5,8 @@
 #include "ArduinoJson.h"
 #include "NostrEvent.h"
 #include "NostrPool.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "time.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/examples/ESP32TestNip01Filter/ESP32TestNip01Filter.cpp b/examples/ESP32TestNip01Filter/ESP32TestNip01Filter.cpp
@@ -5,8 +5,8 @@
 #include "ArduinoJson.h"
 #include "NostrEvent.h"
 #include "NostrPool.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "time.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/examples/ESP32TestNip04/ESP32TestNip04.cpp b/examples/ESP32TestNip04/ESP32TestNip04.cpp
@@ -3,7 +3,7 @@
 #include <Arduino.h>
 
 #include "Nip04.h"
-#include "Transport.h"
+#include "NostrTransport.h"
 #include "services/NWC.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/examples/ESP8266TestNip01/ESP8266TestNip01.cpp b/examples/ESP8266TestNip01/ESP8266TestNip01.cpp
@@ -8,8 +8,8 @@
 #include "ArduinoJson.h"
 #include "NostrEvent.h"
 #include "NostrPool.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "time.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/examples/PICOWTestNip01/PICOWTestNip01.cpp b/examples/PICOWTestNip01/PICOWTestNip01.cpp
@@ -4,8 +4,8 @@
 #include "ArduinoJson.h"
 #include "NostrEvent.h"
 #include "NostrPool.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "time.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/examples/UNOR4TestNip01/UNOR4TestNip01.cpp b/examples/UNOR4TestNip01/UNOR4TestNip01.cpp
@@ -6,8 +6,8 @@
 #include "ArduinoJson.h"
 #include "NostrEvent.h"
 #include "NostrPool.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "time.h"
 
 #define WIFI_SSID "Wokwi-GUEST"

diff --git a/src/Nip04.h b/src/Nip04.h
@@ -1,10 +1,10 @@
 #ifndef _NIP04_H
 #define _NIP04_H
+#include "NostrString.h"
+#include "NostrUtils.h"
 #include <Arduino.h>
-#include <aes.h>
+#include <NostrAES.h>
 #include <vector>
-#include "NostrString.h"
-#include "Utils.h"
 namespace nostr {
 class Nip04 {
   public:

diff --git a/src/Nip47.h b/src/Nip47.h
@@ -5,11 +5,11 @@
 #include "Nip04.h"
 #include "NostrEvent.h"
 #include "NostrString.h"
-#include "Utils.h"
+#include "NostrUtils.h"
 #include <initializer_list>
 #include <vector>
 namespace nostr {
-    
+
 typedef struct s_Invoice {
     NostrString invoice;
     unsigned long amount;

diff --git a/src/aes.cpp → src/NostrAES.cpp b/src/aes.cpp → src/NostrAES.cpp
@@ -36,7 +36,7 @@ NOTE:   String length must be evenly divisible by 16byte (str_len % 16 == 0)
 /* Includes:                                                                 */
 /*****************************************************************************/
 #include <string.h> // CBC mode, for memset
-#include "aes.h"
+#include "NostrAES.h"
 
 /*****************************************************************************/
 /* Defines:                                                                  */

diff --git a/src/aes.h → src/NostrAES.h b/src/aes.h → src/NostrAES.h
diff --git a/src/aes.hpp → src/NostrAES.hpp b/src/aes.hpp → src/NostrAES.hpp
@@ -6,7 +6,7 @@
 #endif //__cplusplus
 
 extern "C" {
-#include "aes.h"
+#include "NostrAES.h"
 }
 
 #endif //_AES_HPP_
diff --git a/src/Common.h → src/NostrCommon.h b/src/Common.h → src/NostrCommon.h
diff --git a/src/NostrEvent.h b/src/NostrEvent.h
@@ -5,8 +5,8 @@
 
 #include "ArduinoJson.h"
 #include "NostrString.h"
-#include "Utils.h"
-#include <aes.h>
+#include "NostrUtils.h"
+#include <NostrAES.h>
 #include <functional>
 #include <initializer_list>
 #include <map>

diff --git a/src/NostrPool.h b/src/NostrPool.h
@@ -1,7 +1,7 @@
 #ifndef _NOSTR_POOL_H
 #define _NOSTR_POOL_H
 #include <Arduino.h>
-#include <Transport.h>
+#include <NostrTransport.h>
 #include <functional>
 #include <initializer_list>
 #include <map>

diff --git a/src/NostrString.h b/src/NostrString.h
@@ -11,7 +11,7 @@
 #endif
 
 
-#include "Utils.h"
+#include "NostrUtils.h"
 #include <vector>
 
 #ifdef ARDUINO

diff --git a/src/Transport.h → src/NostrTransport.h b/src/Transport.h → src/NostrTransport.h
diff --git a/src/Utils.cpp → src/NostrUtils.cpp b/src/Utils.cpp → src/NostrUtils.cpp
@@ -1,4 +1,4 @@
-#include "Utils.h"
+#include "NostrUtils.h"
 
 #include "uBitcoin/src/Bitcoin.h"
 #include "uBitcoin/src/Hash.h"

diff --git a/src/Utils.h → src/NostrUtils.h b/src/Utils.h → src/NostrUtils.h
diff --git a/src/esp32/ESP32Platform.h b/src/esp32/ESP32Platform.h
@@ -1,11 +1,11 @@
 #ifndef _NOSTR_ESP32_PLATFORM_H
 #define _NOSTR_ESP32_PLATFORM_H 1
-#include "Common.h"
+#include "NostrCommon.h"
 
 #ifdef _ESP32_BOARD_
 #include "ESP32Transport.h"
 #include "NostrString.h"
-#include "Utils.h"
+#include "NostrUtils.h"
 #include "WiFi.h"
 #include "bootloader_random.h"
 #include "esp_random.h"

diff --git a/src/esp32/ESP32Transport.cpp b/src/esp32/ESP32Transport.cpp
@@ -1,5 +1,5 @@
 #include "ESP32Transport.h"
-#include "Common.h"
+#include "NostrCommon.h"
 
 #if defined(_ESP32_BOARD_) || defined(_ESP8266_BOARD_)
 using namespace nostr;

diff --git a/src/esp32/ESP32Transport.h b/src/esp32/ESP32Transport.h
@@ -1,13 +1,13 @@
 #ifndef _NOSTR_ESP32_TRANSPORT_H
 #define _NOSTR_ESP32_TRANSPORT_H 1
-#include "Common.h"
+#include "NostrCommon.h"
 
 #if defined(_ESP32_BOARD_) || defined(_ESP8266_BOARD_)
 
 #include "ArduinoJson.h"
 #include "NostrString.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #ifdef _ESP8266_BOARD_
 #include <ESP8266HTTPClient.h>
 #include <ESP8266WiFi.h>

diff --git a/src/esp8266/ESP8266Platform.h b/src/esp8266/ESP8266Platform.h
@@ -1,13 +1,13 @@
 #ifndef _NOSTR_ESP8266_PLATFORM_H
 #define _NOSTR_ESP8266_PLATFORM_H 1
 
-#include "Common.h"
+#include "NostrCommon.h"
 
 #ifdef _ESP8266_BOARD_
 
 #include "ESP8266Transport.h"
 #include "NostrString.h"
-#include "Utils.h"
+#include "NostrUtils.h"
 #include "time.h"
 #include <ESP8266HTTPClient.h>
 #include <ESP8266TrueRandom.h>

diff --git a/src/esp8266/ESP8266Transport.h b/src/esp8266/ESP8266Transport.h
@@ -1,6 +1,6 @@
 #ifndef _NOSTR_ESP8266_TRANSPORT_H
 #define _NOSTR_ESP8266_TRANSPORT_H 1
-#include "Common.h"
+#include "NostrCommon.h"
 
 #ifdef _ESP8266_BOARD_
 

diff --git a/src/picow/PICOWPlatform.h b/src/picow/PICOWPlatform.h
@@ -1,5 +1,5 @@
 
-#include "Common.h"
+#include "NostrCommon.h"
 #ifndef _NOSTR_PICOW_PLATFORM_H
 #define _NOSTR_PICOW_PLATFORM_H 
 #ifdef _PICOW_BOARD_
@@ -8,7 +8,7 @@
 #include <WiFi.h>
 #include "Arduino.h"
 #include "NostrString.h"
-#include "Utils.h"
+#include "NostrUtils.h"
 #include "picow/PICOWTransport.h"
 #include <time.h>
 namespace nostr {

diff --git a/src/picow/PICOWTransport.h b/src/picow/PICOWTransport.h
@@ -1,6 +1,6 @@
 #ifndef _NOSTR_PICOW_TRANSPORT_H
 #define _NOSTR_PICOW_TRANSPORT_H
-#include "Common.h"
+#include "NostrCommon.h"
 
 #ifdef _PICOW_BOARD_
 
@@ -10,8 +10,8 @@
 #include "HTTPClient.h"
 #include "IPAddress.h"
 #include "NostrString.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include <initializer_list>
 #include <vector>
 namespace nostr {

diff --git a/src/services/NWC.h b/src/services/NWC.h
@@ -8,8 +8,8 @@
 #include "NostrEvent.h"
 #include "NostrPool.h"
 #include "NostrString.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 
 namespace nostr {
 class NWCResponseCallbackBase {

diff --git a/src/unor4/UNOR4Platform.h b/src/unor4/UNOR4Platform.h
@@ -1,5 +1,5 @@
 
-#include "Common.h"
+#include "NostrCommon.h"
 
 #ifndef _NOSTR_UNOR4_PLATFORM_H
 #define _NOSTR_UNOR4_PLATFORM_H
@@ -8,7 +8,7 @@
 #include "Arduino.h"
 #include "NostrString.h"
 #include "RTC.h"
-#include "Utils.h"
+#include "NostrUtils.h"
 #include "unor4/UNOR4Transport.h"
 
 #include <NTPClient.h>

diff --git a/src/unor4/UNOR4Transport.h b/src/unor4/UNOR4Transport.h
@@ -1,4 +1,4 @@
-#include "Common.h"
+#include "NostrCommon.h"
 #ifndef _NOSTR_UNOR4_TRANSPORT_H
 #define _NOSTR_UNOR4_TRANSPORT_H
 #ifdef _UNOR4_BOARD_
@@ -8,8 +8,8 @@
 #include "ArduinoJson.h"
 #include "IPAddress.h"
 #include "NostrString.h"
-#include "Transport.h"
-#include "Utils.h"
+#include "NostrTransport.h"
+#include "NostrUtils.h"
 #include "WiFiS3.h"
 #include "WiFiSSLClient.h"
 #include <initializer_list>