Tidying up

6 files changed, 6 insertions, 11 deletions

diff --git a/src/Display/ButtonMenuItem.h b/src/Display/ButtonMenuItem.h
index 5e723c17..eed53756 100644
--- a/src/Display/ButtonMenuItem.h
+++ b/src/Display/ButtonMenuItem.h
@@ -15,8 +15,7 @@
 class ButtonMenuItem final : public MenuItem
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<ButtonMenuItem>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<ButtonMenuItem>(p); }
+	DECLARE_FREELIST_NEW_DELETE(ButtonMenuItem)
 
 	ButtonMenuItem(PixelNumber r, PixelNumber c, PixelNumber w, FontNumber fn, const char *t, const char *cmd, const char *acFile) noexcept;
 	void Draw(Lcd& lcd, PixelNumber maxWidth, bool highlight) noexcept override;
diff --git a/src/Display/FilesMenuItem.h b/src/Display/FilesMenuItem.h
index 93e4ebc7..1166acad 100644
--- a/src/Display/FilesMenuItem.h
+++ b/src/Display/FilesMenuItem.h
@@ -15,8 +15,7 @@
 class FilesMenuItem final : public MenuItem
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<FilesMenuItem>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<FilesMenuItem>(p); }
+	DECLARE_FREELIST_NEW_DELETE(FilesMenuItem)
 
 	FilesMenuItem(PixelNumber r, PixelNumber c, PixelNumber w, FontNumber fn, const char *_ecv_array cmd, const char *_ecv_array dir, const char *_ecv_array acFile, unsigned int nf) noexcept;
 	void Draw(Lcd& lcd, PixelNumber rightMargin, bool highlight) noexcept override;
diff --git a/src/Display/ImageMenuItem.h b/src/Display/ImageMenuItem.h
index bc7005f2..fa301190 100644
--- a/src/Display/ImageMenuItem.h
+++ b/src/Display/ImageMenuItem.h
@@ -15,8 +15,7 @@
 class ImageMenuItem final : public MenuItem
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<ImageMenuItem>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<ImageMenuItem>(p); }
+	DECLARE_FREELIST_NEW_DELETE(ImageMenuItem)
 
 	ImageMenuItem(PixelNumber r, PixelNumber c, const char *_ecv_array pFileName) noexcept;
 
diff --git a/src/Display/TextMenuItem.h b/src/Display/TextMenuItem.h
index 6e75765f..2da2492b 100644
--- a/src/Display/TextMenuItem.h
+++ b/src/Display/TextMenuItem.h
@@ -15,8 +15,7 @@
 class TextMenuItem final : public MenuItem
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<TextMenuItem>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<TextMenuItem>(p); }
+	DECLARE_FREELIST_NEW_DELETE(TextMenuItem)
 
 	TextMenuItem(PixelNumber r, PixelNumber c, PixelNumber w, Alignment a, FontNumber fn, const char *_ecv_array t) noexcept;
 	void Draw(Lcd& lcd, PixelNumber maxWidth, bool highlight) noexcept override;
diff --git a/src/Display/ValueMenuItem.h b/src/Display/ValueMenuItem.h
index fb22738c..2660bb7e 100644
--- a/src/Display/ValueMenuItem.h
+++ b/src/Display/ValueMenuItem.h
@@ -17,8 +17,7 @@
 class ValueMenuItem final : public MenuItem
 {
 public:
-	void* operator new(size_t sz) noexcept { return FreelistManager::Allocate<ValueMenuItem>(); }
-	void operator delete(void* p) noexcept { FreelistManager::Release<ValueMenuItem>(p); }
+	DECLARE_FREELIST_NEW_DELETE(ValueMenuItem)
 
 	ValueMenuItem(PixelNumber r, PixelNumber c, PixelNumber w, Alignment a, FontNumber fn, bool adj, const char *_ecv_array _ecv_null om, unsigned int v, unsigned int d) noexcept;
 	void Draw(Lcd& lcd, PixelNumber maxWidth, bool highlight) noexcept override;
diff --git a/src/Storage/FileInfoParser.cpp b/src/Storage/FileInfoParser.cpp
index 1ecc187c..a41d52f1 100644
--- a/src/Storage/FileInfoParser.cpp
+++ b/src/Storage/FileInfoParser.cpp
@@ -487,7 +487,7 @@ bool FileInfoParser::FindHeight(const char* bufp, size_t len) noexcept
 	return foundHeight;
 }
 
-// Scan the buffer for th total number of layers. The buffer is null-terminated.
+// Scan the buffer for the total number of layers. The buffer is null-terminated.
 bool FileInfoParser::FindNumLayers(const char* bufp, size_t len) noexcept
 {
 	static const char* const numLayerStrings[] =