Committing clang-format/clang-tidy changes

Author: Clang Robot

src/Displays/DisplaySystem.hpp

@@ -78,7 +78,7 @@ class DisplaySystem : public RendererDisplay {
 public:
     DisplaySystem();
     DisplaySystem(DisplaySystem const &) = delete;
-    virtual ~DisplaySystem() = default;
+    ~DisplaySystem() override = default;
 
     // Constant text-box inset defaults during reading. These should be overridden to sane values in
     // subclasses.
@@ -235,11 +235,11 @@ class DisplaySystem : public RendererDisplay {
     void drawXBitmap(int16_t x, int16_t y, const uint8_t bitmap[], int16_t w, int16_t h,
                      uint16_t color) override;
 
-    inline uint16_t lineHeight(FontHandle font) override {
+    inline auto lineHeight(FontHandle font) -> uint16_t override {
         return font.ptr ? reinterpret_cast<Font *>(font.ptr)->lineHeight() : 0;
     }
 
-    inline uint16_t getTextWidth(const char *cstr, FontHandle font) override {
+    inline auto getTextWidth(const char *cstr, FontHandle font) -> uint16_t override {
         if (!font.ptr || cstr == nullptr) {
             return 0;
         }
@@ -261,7 +261,7 @@ class DisplaySystem : public RendererDisplay {
         *outHeight = dim.height;
     }
 
-    virtual auto getSuperscriptCharacter(const char inputChar, FontHandle font) const -> const
+    [[nodiscard]] auto getSuperscriptCharacter(const char inputChar, FontHandle font) const -> const
         char * override {
 #if CONFIG_TINYFONT_IBMF
         return reinterpret_cast<Font *>(font.ptr)->getSuperscriptCharacter(inputChar);
@@ -272,7 +272,7 @@ class DisplaySystem : public RendererDisplay {
 #endif
     };
 
-    virtual auto getSubscriptCharacter(const char inputChar, FontHandle font) const -> const
+    [[nodiscard]] auto getSubscriptCharacter(const char inputChar, FontHandle font) const -> const
         char * override {
 #if CONFIG_TINYFONT_IBMF
         return reinterpret_cast<Font *>(font.ptr)->getSubscriptCharacter(inputChar);
@@ -297,7 +297,9 @@ class DisplaySystem : public RendererDisplay {
 
     inline auto drawSingleLineOfText(const char *cstr, int16_t x, int16_t y, bool invert,
                                      FontHandle font) -> int16_t override {
-        if (!font.ptr || !cstr) return x;
+        if (!font.ptr || !cstr) {
+            return x;
+        }
         return static_cast<int16_t>(this->drawSingleLineOfText(std::string(cstr), x, y, invert,
                                                                reinterpret_cast<Font *>(font.ptr)));
     }

src/Storage/EPubAdditions.cpp

@@ -1,11 +1,12 @@
 #include "EPubAdditions.hpp"
 
-auto HasSummary(std::shared_ptr<EPubFile> epubFile, const std::string_view &spineHref) -> bool {
+auto HasSummary(const std::shared_ptr<EPubFile> &epubFile, const std::string_view &spineHref)
+    -> bool {
     return epubFile->hasEpubAddition(spineHref, "summary");
 }
 
 auto GetSummaryContent(
-    std::shared_ptr<EPubFile> epubFile, const std::shared_ptr<EPubPlace> &placeInReadable,
+    const std::shared_ptr<EPubFile> &epubFile, const std::shared_ptr<EPubPlace> &placeInReadable,
     std::shared_ptr<TxtPlace> &placeInSummary,
     const std::shared_ptr<UserReadablePartialChapterSummary> &partialChapterSummary,
     bool includeUnread) -> SpiramString {
@@ -105,11 +106,12 @@ auto GetSummaryContent(
     return summaryText;
 }
 
-auto HasDictionary(std::shared_ptr<EPubFile> epubFile, const std::string_view &spineHref) -> bool {
+auto HasDictionary(const std::shared_ptr<EPubFile> &epubFile, const std::string_view &spineHref)
+    -> bool {
     return epubFile->hasEpubAddition(spineHref, "dictionary");
 }
 
-auto GetDictionaryContent(std::shared_ptr<EPubFile> epubFile,
+auto GetDictionaryContent(const std::shared_ptr<EPubFile> &epubFile,
                           const std::shared_ptr<EPubPlace> &placeInReadable,
                           std::shared_ptr<TxtPlace> &placeInDictionary) -> SpiramString {
 

src/Storage/EPubAdditions.hpp

@@ -6,16 +6,18 @@
 
 #include "Models/UserReadablePartialChapterSummary.hpp"
 
-auto HasSummary(std::shared_ptr<EPubFile> epubFile, const std::string_view &spineHref) -> bool;
+auto HasSummary(const std::shared_ptr<EPubFile> &epubFile, const std::string_view &spineHref)
+    -> bool;
 
 auto GetSummaryContent(
-    std::shared_ptr<EPubFile> epubFile, const std::shared_ptr<EPubPlace> &placeInReadable,
+    const std::shared_ptr<EPubFile> &epubFile, const std::shared_ptr<EPubPlace> &placeInReadable,
     std::shared_ptr<TxtPlace> &placeInSummary,
     const std::shared_ptr<UserReadablePartialChapterSummary> &partialChapterSummary,
     bool includeUnread) -> SpiramString;
 
-auto HasDictionary(std::shared_ptr<EPubFile> epubFile, const std::string_view &spineHref) -> bool;
+auto HasDictionary(const std::shared_ptr<EPubFile> &epubFile, const std::string_view &spineHref)
+    -> bool;
 
-auto GetDictionaryContent(std::shared_ptr<EPubFile> epubFile,
+auto GetDictionaryContent(const std::shared_ptr<EPubFile> &epubFile,
                           const std::shared_ptr<EPubPlace> &placeInReadable,
                           std::shared_ptr<TxtPlace> &placeInDictionary) -> SpiramString;

src/Storage/SolDrm.hpp

@@ -15,7 +15,7 @@
 class SolDrm : public EPubDrm {
 public:
     SolDrm(PreferencesStore &prefs) : prefs_(prefs){};
-    ~SolDrm();
+    ~SolDrm() override;
 
     auto publicKeyPem() -> std::string;
     auto parseKeyfile(const uint8_t *data, size_t length)