From ed02f20c3659c2e85e0460d1a0227a24c68f2a53 Mon Sep 17 00:00:00 2001 From: jpirnay Date: Wed, 1 Apr 2026 10:41:56 +0200 Subject: [PATCH] yaclf --- lib/KOReaderSync/ChapterXPathForwardMapper.cpp | 8 ++++---- lib/KOReaderSync/ChapterXPathIndexer.cpp | 8 ++++---- lib/KOReaderSync/ChapterXPathIndexerState.h | 4 ++-- lib/KOReaderSync/ChapterXPathReverseMapper.cpp | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/KOReaderSync/ChapterXPathForwardMapper.cpp b/lib/KOReaderSync/ChapterXPathForwardMapper.cpp index 1a42ef08..59477a0b 100644 --- a/lib/KOReaderSync/ChapterXPathForwardMapper.cpp +++ b/lib/KOReaderSync/ChapterXPathForwardMapper.cpp @@ -1,15 +1,15 @@ #include "ChapterXPathForwardMapper.h" -#include "ChapterXPathIndexerInternal.h" -#include "ChapterXPathIndexerState.h" - #include #include #include #include -#include #include +#include + +#include "ChapterXPathIndexerInternal.h" +#include "ChapterXPathIndexerState.h" namespace ChapterXPathIndexerInternal { diff --git a/lib/KOReaderSync/ChapterXPathIndexer.cpp b/lib/KOReaderSync/ChapterXPathIndexer.cpp index 1e950bf8..61e5ce74 100644 --- a/lib/KOReaderSync/ChapterXPathIndexer.cpp +++ b/lib/KOReaderSync/ChapterXPathIndexer.cpp @@ -1,9 +1,5 @@ #include "ChapterXPathIndexer.h" -#include "ChapterXPathForwardMapper.h" -#include "ChapterXPathIndexerInternal.h" -#include "ChapterXPathReverseMapper.h" - #include #include @@ -11,6 +7,10 @@ #include #include +#include "ChapterXPathForwardMapper.h" +#include "ChapterXPathIndexerInternal.h" +#include "ChapterXPathReverseMapper.h" + using namespace ChapterXPathIndexerInternal; // Public facade used by ProgressMapper. It intentionally stays thin and delegates diff --git a/lib/KOReaderSync/ChapterXPathIndexerState.h b/lib/KOReaderSync/ChapterXPathIndexerState.h index 2c724b82..f0c3b419 100644 --- a/lib/KOReaderSync/ChapterXPathIndexerState.h +++ b/lib/KOReaderSync/ChapterXPathIndexerState.h @@ -1,11 +1,11 @@ #pragma once -#include "ChapterXPathIndexerInternal.h" - #include #include #include +#include "ChapterXPathIndexerInternal.h" + namespace ChapterXPathIndexerInternal { // Shared parser state used by both forward and reverse mappers. diff --git a/lib/KOReaderSync/ChapterXPathReverseMapper.cpp b/lib/KOReaderSync/ChapterXPathReverseMapper.cpp index 1310081f..4ecc7f5e 100644 --- a/lib/KOReaderSync/ChapterXPathReverseMapper.cpp +++ b/lib/KOReaderSync/ChapterXPathReverseMapper.cpp @@ -1,8 +1,5 @@ #include "ChapterXPathReverseMapper.h" -#include "ChapterXPathIndexerInternal.h" -#include "ChapterXPathIndexerState.h" - #include #include #include @@ -11,6 +8,9 @@ #include #include +#include "ChapterXPathIndexerInternal.h" +#include "ChapterXPathIndexerState.h" + namespace ChapterXPathIndexerInternal { namespace { @@ -225,8 +225,8 @@ bool findProgressForXPathInternal(const std::shared_ptr& epub, const int s outIntraSpineProgress = std::max(0.0f, std::min(1.0f, outIntraSpineProgress)); } - LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex, - state.bestTierName, state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str()); + LOG_DBG("KOX", "Reverse: spine=%d %s match offset=%zu/%zu -> progress=%.3f for '%s'", spineIndex, state.bestTierName, + state.bestOffset, state.totalTextBytes, outIntraSpineProgress, xpath.c_str()); return true; }