From 3664355b1ad8d0084af4aff9f5993e78c2be72ea Mon Sep 17 00:00:00 2001 From: Yaroslav Date: Thu, 22 Jan 2026 02:43:40 +0300 Subject: [PATCH] Run clang-format-fix --- src/activities/home/MyLibraryActivity.cpp | 2 +- src/activities/reader/EpubReaderActivity.cpp | 3 +-- src/activities/reader/EpubReaderChapterSelectionActivity.cpp | 5 +---- src/activities/reader/XtcReaderActivity.cpp | 2 +- src/activities/reader/XtcReaderActivity.h | 2 +- src/activities/reader/XtcReaderChapterSelectionActivity.cpp | 3 --- src/activities/settings/SettingsActivity.cpp | 2 +- 7 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/activities/home/MyLibraryActivity.cpp b/src/activities/home/MyLibraryActivity.cpp index 134451dd..36099e5e 100644 --- a/src/activities/home/MyLibraryActivity.cpp +++ b/src/activities/home/MyLibraryActivity.cpp @@ -5,8 +5,8 @@ #include -#include "MappedInputManager.h" #include "CrossPointSettings.h" +#include "MappedInputManager.h" #include "RecentBooksStore.h" #include "ScreenComponents.h" #include "fontIds.h" diff --git a/src/activities/reader/EpubReaderActivity.cpp b/src/activities/reader/EpubReaderActivity.cpp index 045d6f76..cd437467 100644 --- a/src/activities/reader/EpubReaderActivity.cpp +++ b/src/activities/reader/EpubReaderActivity.cpp @@ -162,7 +162,7 @@ void EpubReaderActivity::loop() { return; } - // Detect long-press and schedule skip immediately + // Detect long-press and schedule skip immediately const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) || mappedInput.isPressed(MappedInputManager::Button::Left); const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) || @@ -213,7 +213,6 @@ void EpubReaderActivity::loop() { return; } - // No current section, attempt to rerender the book if (!section) { updateRequired = true; diff --git a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp index d34d8577..cf7d4559 100644 --- a/src/activities/reader/EpubReaderChapterSelectionActivity.cpp +++ b/src/activities/reader/EpubReaderChapterSelectionActivity.cpp @@ -2,15 +2,12 @@ #include +#include "CrossPointSettings.h" #include "KOReaderCredentialStore.h" #include "KOReaderSyncActivity.h" -#include "CrossPointSettings.h" #include "MappedInputManager.h" #include "fontIds.h" -namespace { -} // namespace - bool EpubReaderChapterSelectionActivity::hasSyncOption() const { return KOREADER_STORE.hasCredentials(); } int EpubReaderChapterSelectionActivity::getTotalItems() const { diff --git a/src/activities/reader/XtcReaderActivity.cpp b/src/activities/reader/XtcReaderActivity.cpp index a02aa3f0..0f78f26a 100644 --- a/src/activities/reader/XtcReaderActivity.cpp +++ b/src/activities/reader/XtcReaderActivity.cpp @@ -110,7 +110,7 @@ void XtcReaderActivity::loop() { return; } - // Detect long-press and schedule skip immediately + // Detect long-press and schedule skip immediately const bool prevPressed = mappedInput.isPressed(MappedInputManager::Button::PageBack) || mappedInput.isPressed(MappedInputManager::Button::Left); const bool nextPressed = mappedInput.isPressed(MappedInputManager::Button::PageForward) || diff --git a/src/activities/reader/XtcReaderActivity.h b/src/activities/reader/XtcReaderActivity.h index 75c20d01..72dff9a2 100644 --- a/src/activities/reader/XtcReaderActivity.h +++ b/src/activities/reader/XtcReaderActivity.h @@ -24,7 +24,7 @@ class XtcReaderActivity final : public ActivityWithSubactivity { bool delayedSkipPending = false; int delayedSkipDir = 0; uint32_t delayedSkipExecuteAtMs = 0; - uint32_t delayedSkipAmount = 0; + uint32_t delayedSkipAmount = 0; bool awaitingReleaseAfterSkip = false; bool skipUnpressed = false; const std::function onGoBack; diff --git a/src/activities/reader/XtcReaderChapterSelectionActivity.cpp b/src/activities/reader/XtcReaderChapterSelectionActivity.cpp index bb31aa44..ae426206 100644 --- a/src/activities/reader/XtcReaderChapterSelectionActivity.cpp +++ b/src/activities/reader/XtcReaderChapterSelectionActivity.cpp @@ -6,9 +6,6 @@ #include "MappedInputManager.h" #include "fontIds.h" -namespace { -} // namespace - int XtcReaderChapterSelectionActivity::getPageItems() const { constexpr int startY = 60; constexpr int lineHeight = 30; diff --git a/src/activities/settings/SettingsActivity.cpp b/src/activities/settings/SettingsActivity.cpp index 0b53eb94..2b390351 100644 --- a/src/activities/settings/SettingsActivity.cpp +++ b/src/activities/settings/SettingsActivity.cpp @@ -42,7 +42,7 @@ const SettingInfo controlsSettings[controlsSettingsCount] = { SettingInfo::Enum("Side Button Layout (reader)", &CrossPointSettings::sideButtonLayout, {"Prev, Next", "Next, Prev"}), SettingInfo::Toggle("Long-press Chapter Skip", &CrossPointSettings::longPressChapterSkip), - SettingInfo::Enum("Long-press Duration", &CrossPointSettings::longPressDuration, {"1s", "2s", "3s", "5s", "10s"}), + SettingInfo::Enum("Long-press Duration", &CrossPointSettings::longPressDuration, {"1s", "2s", "3s", "5s", "10s"}), SettingInfo::Enum("Short Power Button Click", &CrossPointSettings::shortPwrBtn, {"Ignore", "Sleep", "Page Turn"})}; constexpr int systemSettingsCount = 5;