From c0dc6b90671e8ec25bc32d3bffcee72233f13ed2 Mon Sep 17 00:00:00 2001 From: Dave Allie Date: Wed, 17 Dec 2025 23:19:10 +1100 Subject: [PATCH] Use anonymous namespaces for local consts --- lib/Epub/Epub/Page.cpp | 2 ++ lib/Epub/Epub/Section.cpp | 2 ++ src/CrossPointSettings.cpp | 2 ++ src/CrossPointState.cpp | 2 ++ src/activities/home/HomeActivity.cpp | 4 ++++ src/activities/home/HomeActivity.h | 2 -- 6 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/Epub/Epub/Page.cpp b/lib/Epub/Epub/Page.cpp index 09abd08..01bb3ac 100644 --- a/lib/Epub/Epub/Page.cpp +++ b/lib/Epub/Epub/Page.cpp @@ -3,7 +3,9 @@ #include #include +namespace { constexpr uint8_t PAGE_FILE_VERSION = 3; +} void PageLine::render(GfxRenderer& renderer, const int fontId) { block->render(renderer, fontId, xPos, yPos); } diff --git a/lib/Epub/Epub/Section.cpp b/lib/Epub/Epub/Section.cpp index 9c05208..7c9d241 100644 --- a/lib/Epub/Epub/Section.cpp +++ b/lib/Epub/Epub/Section.cpp @@ -9,7 +9,9 @@ #include "Page.h" #include "parsers/ChapterHtmlSlimParser.h" +namespace { constexpr uint8_t SECTION_FILE_VERSION = 5; +} void Section::onPageComplete(std::unique_ptr page) { const auto filePath = cachePath + "/page_" + std::to_string(pageCount) + ".bin"; diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp index 8d3a40e..1f8c3bd 100644 --- a/src/CrossPointSettings.cpp +++ b/src/CrossPointSettings.cpp @@ -10,9 +10,11 @@ // Initialize the static instance CrossPointSettings CrossPointSettings::instance; +namespace { constexpr uint8_t SETTINGS_FILE_VERSION = 1; constexpr uint8_t SETTINGS_COUNT = 2; constexpr char SETTINGS_FILE[] = "/sd/.crosspoint/settings.bin"; +} // namespace bool CrossPointSettings::saveToFile() const { // Make sure the directory exists diff --git a/src/CrossPointState.cpp b/src/CrossPointState.cpp index 897447e..dd96593 100644 --- a/src/CrossPointState.cpp +++ b/src/CrossPointState.cpp @@ -6,8 +6,10 @@ #include +namespace { constexpr uint8_t STATE_FILE_VERSION = 1; constexpr char STATE_FILE[] = "/sd/.crosspoint/state.bin"; +} // namespace CrossPointState CrossPointState::instance; diff --git a/src/activities/home/HomeActivity.cpp b/src/activities/home/HomeActivity.cpp index cc5712a..19b30c0 100644 --- a/src/activities/home/HomeActivity.cpp +++ b/src/activities/home/HomeActivity.cpp @@ -5,6 +5,10 @@ #include "config.h" +namespace { +constexpr int menuItemCount = 2; +} + void HomeActivity::taskTrampoline(void* param) { auto* self = static_cast(param); self->displayTaskLoop(); diff --git a/src/activities/home/HomeActivity.h b/src/activities/home/HomeActivity.h index 48c3aa8..7f6ac4d 100644 --- a/src/activities/home/HomeActivity.h +++ b/src/activities/home/HomeActivity.h @@ -15,8 +15,6 @@ class HomeActivity final : public Activity { const std::function onReaderOpen; const std::function onSettingsOpen; - static constexpr int menuItemCount = 2; - static void taskTrampoline(void* param); [[noreturn]] void displayTaskLoop(); void render() const;