Replace Defer includes

Author: johnboiles

lib/Simulator/SimAutomation.cpp

@@ -7,10 +7,10 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
 #pragma clang diagnostic pop
+#include <Defer/Defer.hpp>
 #include <unistd.h>
 
 #include "Inputs/RemoteInput.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/Dispatch.hpp"
 #include "UI/ReadableScreen.hpp"
 #include "UI/Screen.hpp"

src/Communications/BLEHttpClient.cpp

@@ -2,14 +2,14 @@
 
 #include "Communications/BLEHttpClient.hpp"
 
+#include <Defer/Defer.hpp>
 #include <cstddef>
 #include <cstdlib>
 #include <esp_debug_helpers.h>
 #include <esp_timer.h>
 #include <utility>
 
 #include "Communications/SindarinAPI.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/RateLimiter.hpp"
 
 BLEHttpClient::BLEHttpClient(const char *url, std::shared_ptr<CancelFlag> cancelFlag,

src/Communications/FileDownload.cpp

@@ -1,13 +1,13 @@
 #include "FileDownload.hpp"
 
+#include <Defer/Defer.hpp>
 #include <Spiram/Memory.hpp>
 #include <esp_heap_caps.h>
 #include <esp_timer.h>
 #include <freertos/ringbuf.h>
 #include <utility>
 
 #include "Communications/SindarinAPI.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/GUnzipStream.hpp"
 #include "Misc/RateLimiter.hpp"
 #include "sindarin-debug.h"

src/Communications/SindarinAPI.cpp

@@ -1,5 +1,6 @@
 #include "SindarinAPI.hpp"
 
+#include <Defer/Defer.hpp>
 #include <StringUtil/StringUtil.hpp>
 #include <utility>
 
@@ -14,7 +15,6 @@
 #include "Communications/WiFiHttpClient.hpp"
 #include "FileDownload.hpp"
 #include "Misc/Battery.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/Platform.hpp"
 #include "Models/Json.hpp"
 #include "Models/UserReadable.hpp"

src/Communications/WiFi.cpp

@@ -1,10 +1,10 @@
 #include "Communications/WiFi.hpp"
 
+#include <Defer/Defer.hpp>
 #include <Spiram/Memory.hpp>
 #include <cstring>
 #include <string>
 
-#include "Misc/Defer.hpp"
 #include "config.h"
 #include "sindarin-debug.h"
 

src/Misc/Defer.hpp

@@ -1,9 +1,9 @@
 #include "Dispatch.hpp"
 
+#include <Defer/Defer.hpp>
 #include <StringUtil/StringUtil.hpp>
 #include <cassert>
 
-#include "Misc/Defer.hpp"
 #include "Misc/Platform.hpp"
 #include "sindarin-debug.h"
 

src/Misc/Dispatch.cpp

@@ -1,9 +1,9 @@
 #pragma once
 
+#include <Defer/Defer.hpp>
 #include <Spiram/String.hpp>
 #include <string>
 
-#include "Misc/Defer.hpp"
 #include "Models/JsonSerializable.hpp"
 #include "Models/Place.hpp"
 #include "Storage/FileSystem.hpp"

src/Models/UserReadablePartialChapterSummary.hpp

@@ -1,10 +1,10 @@
 #pragma once
 
+#include <Defer/Defer.hpp>
 #include <Spiram/String.hpp>
 #include <Spiram/Vector.hpp>
 #include <string>
 
-#include "Misc/Defer.hpp"
 #include "Models/JsonSerializable.hpp"
 #include "Models/Place.hpp"
 #include "Storage/FileSystem.hpp"

src/Models/UserReadablePlacemarkHistory.hpp

@@ -1,5 +1,6 @@
 #include "LocalStore.hpp"
 
+#include <Defer/Defer.hpp>
 #include <StringUtil/StringUtil.hpp>
 #include <algorithm>
 #include <cmath>
@@ -20,7 +21,6 @@
 #include "Communications/HtmlCleaner.hpp"
 #include "Communications/WiFi.hpp"
 #include "Misc/Crypto.hpp"
-#include "Misc/Defer.hpp"
 #include "Misc/GUnzipStream.hpp"
 #include "Misc/Platform.hpp"
 #include "Misc/PowerManager.hpp"