apply format, apply cpplint

jakoch · jakoch · commit c687930eb7ad · 2026-04-28T17:31:50.000+02:00
diff --git a/include/fifechan/widgets/activitybar.hpp b/include/fifechan/widgets/activitybar.hpp
@@ -7,6 +7,9 @@
 // Platform config include
 #include "fifechan/platform.hpp"
 
+// Standard library includes
+#include <list>
+
 // Project headers (subdirs before local)
 #include "fifechan/listeners/actionlistener.hpp"
 #include "fifechan/widgets/container.hpp"
diff --git a/include/fifechan/widgets/activitybaritem.hpp b/include/fifechan/widgets/activitybaritem.hpp
@@ -33,7 +33,7 @@ namespace fcn
          * @param icon The icon to display (can be image path or emoji).
          * @param tooltip The tooltip text.
          */
-        ActivityBarItem(std::string const & icon, std::string const & tooltip = "", Widget* panel = nullptr);
+        explicit ActivityBarItem(std::string const & icon, std::string const & tooltip = "", Widget* panel = nullptr);
 
         ~ActivityBarItem() override;
 
diff --git a/include/fifechan/widgets/menubar.hpp b/include/fifechan/widgets/menubar.hpp
@@ -7,6 +7,9 @@
 // Platform config include
 #include "fifechan/platform.hpp"
 
+// Standard library includes
+#include <string>
+
 // Project headers (subdirs before local)
 #include "fifechan/listeners/actionlistener.hpp"
 #include "fifechan/listeners/keylistener.hpp"
diff --git a/include/fifechan/widgets/primarypanel.hpp b/include/fifechan/widgets/primarypanel.hpp
@@ -7,6 +7,9 @@
 // Platform config include
 #include "fifechan/platform.hpp"
 
+// Standard library includes
+#include <string>
+
 // Project headers (subdirs before local)
 #include "fifechan/widgets/panel.hpp"
 
diff --git a/include/fifechan/widgets/secondarypanel.hpp b/include/fifechan/widgets/secondarypanel.hpp
@@ -7,6 +7,9 @@
 // Platform config include
 #include "fifechan/platform.hpp"
 
+// Standard library includes
+#include <string>
+
 // Project headers (subdirs before local)
 #include "fifechan/widgets/panel.hpp"
 
diff --git a/src/imagefont.cpp b/src/imagefont.cpp
@@ -9,6 +9,7 @@
 #include <algorithm>
 #include <iostream>
 #include <map>
+#include <numeric>
 #include <sstream>
 #include <string>
 #include <utility>
@@ -178,7 +179,8 @@ namespace fcn
             std::ostringstream os;
             os << "Image " << mFilename << " is corrupt or uses wrong separator.\n"
                << "Expected: " << expected << " glyphs, Found: " << found.size() << "\n"
-               << "Detected separator: R:" << (int)sep.r << " G:" << (int)sep.g << " B:" << (int)sep.b << "\n"
+               << "Detected separator: R:" << static_cast<int>(sep.r) << " G:" << static_cast<int>(sep.g)
+               << " B:" << static_cast<int>(sep.b) << "\n"
                << "Suggestion: Use ExplicitColor strategy with magenta (255,0,255)";
             throwException(os.str());
         }
@@ -189,19 +191,19 @@ namespace fcn
 
         if (config.verbose) {
             std::cerr << "[ImageFont] Loaded '" << mFilename << "' ExpectedGlyphs=" << expected
-                      << " Found=" << found.size() << " Separator=R:" << (int)sep.r << " G:" << (int)sep.g
-                      << " B:" << (int)sep.b << "\n";
+                      << " Found=" << found.size() << " Separator=R:" << static_cast<int>(sep.r)
+                      << " G:" << static_cast<int>(sep.g) << " B:" << static_cast<int>(sep.b) << "\n";
             for (size_t i = 0; i < glyphs.size(); ++i) {
                 unsigned char const c = static_cast<unsigned char>(glyphs[i]);
                 Rectangle const & r   = mGlyph[c];
-                std::cerr << "  glyph '" << glyphs[i] << "' (" << (int)c << ") -> x=" << r.x << " y=" << r.y
-                          << " w=" << r.width << " h=" << r.height << "\n";
+                std::cerr << "  glyph '" << glyphs[i] << "' (" << static_cast<int>(c) << ") -> x=" << r.x
+                          << " y=" << r.y << " w=" << r.width << " h=" << r.height << "\n";
             }
         }
 
-        mHeight = 0;
-        for (auto const & r : found)
-            mHeight = std::max(mHeight, r.height);
+        mHeight = std::accumulate(found.begin(), found.end(), 0, [](int maxHeight, auto const & r) {
+            return std::max(maxHeight, r.height);
+        });
 
         mImage->convertToDisplayFormat();
         mRowSpacing   = 0;
@@ -320,7 +322,8 @@ namespace fcn
             std::ostringstream os;
             os << "Image " << mFilename << " is corrupt or uses wrong separator.\n"
                << "Expected: " << expected << " glyphs, Found: " << found.size() << "\n"
-               << "Detected separator: R:" << (int)sep.r << " G:" << (int)sep.g << " B:" << (int)sep.b << "\n"
+               << "Detected separator: R:" << static_cast<int>(sep.r) << " G:" << static_cast<int>(sep.g)
+               << " B:" << static_cast<int>(sep.b) << "\n"
                << "Suggestion: Use ExplicitColor strategy with magenta (255,0,255)";
             throwException(os.str());
         }
@@ -329,9 +332,9 @@ namespace fcn
             mGlyph[static_cast<unsigned char>(glyphs[i])] = found[i];
         }
 
-        mHeight = 0;
-        for (auto const & r : found)
-            mHeight = std::max(mHeight, r.height);
+        mHeight = std::accumulate(found.begin(), found.end(), 0, [](int maxHeight, auto const & r) {
+            return std::max(maxHeight, r.height);
+        });
 
         mImage->convertToDisplayFormat();
         mRowSpacing   = 0;
@@ -399,7 +402,8 @@ namespace fcn
             std::ostringstream os;
             os << "Image " << mFilename << " is corrupt or uses wrong separator.\n"
                << "Expected: " << expected << " glyphs, Found: " << found.size() << "\n"
-               << "Detected separator: R:" << (int)sep.r << " G:" << (int)sep.g << " B:" << (int)sep.b << "\n"
+               << "Detected separator: R:" << static_cast<int>(sep.r) << " G:" << static_cast<int>(sep.g)
+               << " B:" << static_cast<int>(sep.b) << "\n"
                << "Suggestion: Use ExplicitColor strategy with magenta (255,0,255)";
             throwException(os.str());
         }
diff --git a/src/widgets/activitybaritem.cpp b/src/widgets/activitybaritem.cpp
@@ -4,6 +4,10 @@
 // Project headers
 #include "fifechan/widgets/activitybaritem.hpp"
 
+// Standard library includes
+#include <string>
+
+// Project headers (subdirs before local)
 #include "fifechan/widgets/label.hpp"
 
 namespace fcn
diff --git a/src/widgets/menubar.cpp b/src/widgets/menubar.cpp
@@ -4,6 +4,9 @@
 // Corresponding header include
 #include "fifechan/widgets/menubar.hpp"
 
+// Standard library includes
+#include <string>
+
 // Project headers
 #include "fifechan/graphics.hpp"
 #include "fifechan/widgets/menuitem.hpp"
diff --git a/src/widgets/menuitem.cpp b/src/widgets/menuitem.cpp
@@ -4,6 +4,11 @@
 // Corresponding header include
 #include "fifechan/widgets/menuitem.hpp"
 
+// Standard library includes
+#include <algorithm>
+#include <memory>
+#include <string>
+
 // Project headers
 #include "fifechan/font.hpp"
 #include "fifechan/graphics.hpp"
diff --git a/src/widgets/menupopup.cpp b/src/widgets/menupopup.cpp
@@ -5,6 +5,8 @@
 #include "fifechan/widgets/menupopup.hpp"
 
 // Standard library includes
+#include <algorithm>
+#include <memory>
 #include <unordered_map>
 
 // Project headers
diff --git a/src/widgets/modalbackdrop.cpp b/src/widgets/modalbackdrop.cpp
@@ -21,7 +21,7 @@ namespace fcn
 
     ModalBackdrop::~ModalBackdrop() = default;
 
-    void ModalBackdrop::draw(Graphics* /*graphics*/)
+    void ModalBackdrop::draw([[maybe_unused]] Graphics*)
     {
         // Intentionally transparent; no drawing required.
     }
@@ -68,7 +68,7 @@ namespace fcn
         event.consume();
     }
 
-    void ModalBackdrop::mouseReleased(MouseEvent& /*event*/) { }
-    void ModalBackdrop::mouseEntered(MouseEvent& /*event*/) { }
-    void ModalBackdrop::mouseExited(MouseEvent& /*event*/) { }
+    void ModalBackdrop::mouseReleased([[maybe_unused]] MouseEvent&) { }
+    void ModalBackdrop::mouseEntered([[maybe_unused]] MouseEvent&) { }
+    void ModalBackdrop::mouseExited([[maybe_unused]] MouseEvent&) { }
 } // namespace fcn
diff --git a/src/widgets/primarypanel.cpp b/src/widgets/primarypanel.cpp
@@ -4,6 +4,9 @@
 // Corresponding header include
 #include "fifechan/widgets/primarypanel.hpp"
 
+// Standard library includes
+#include <string>
+
 namespace fcn
 {
     PrimaryPanel::PrimaryPanel(std::string const & title) : mDefaultWidth(250)
diff --git a/src/widgets/secondarypanel.cpp b/src/widgets/secondarypanel.cpp
@@ -4,6 +4,9 @@
 // Corresponding header include
 #include "fifechan/widgets/secondarypanel.hpp"
 
+// Standard library includes
+#include <string>
+
 namespace fcn
 {
     SecondaryPanel::SecondaryPanel(std::string const & title) : mDefaultWidth(250)
diff --git a/src/widgets/statusbar.cpp b/src/widgets/statusbar.cpp
@@ -6,14 +6,15 @@
 
 // Standard library includes
 #include <cstdio>
+#include <memory>
+#include <string>
 
 // Project headers
 #include "fifechan/font.hpp"
 #include "fifechan/graphics.hpp"
 
 namespace fcn
 {
-#include <cstdio>
 
     StatusBar::StatusBar()
     {
diff --git a/tests/integration/sdl/sdldragdrop.cpp b/tests/integration/sdl/sdldragdrop.cpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
 // SPDX-FileCopyrightText: 2026 Fifengine contributors
-//
 
 /**
  * SDL Drag-and-Drop Inventory Demo with Tooltip Widget
diff --git a/tests/integration/sdl/sdllabels.cpp b/tests/integration/sdl/sdllabels.cpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
-// SPDX-FileCopyrightText: 2004 - 2008 Olof Naessén and Per Larsson
-// SPDX-FileCopyrightText: 2013 - 2026 Fifengine contributors
+// SPDX-FileCopyrightText: 2026 Fifengine contributors
 
 /**
  * @brief Test application demonstrating all 9 combinations of
diff --git a/tests/integration/sdl/sdllabels.hpp b/tests/integration/sdl/sdllabels.hpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
-// SPDX-FileCopyrightText: 2004 - 2008 Olof Naessén and Per Larsson
-// SPDX-FileCopyrightText: 2013 - 2026 Fifengine contributors
+// SPDX-FileCopyrightText: 2026 Fifengine contributors
 
 #ifndef TESTS_INTEGRATION_SDL_SDLLABELS_HPP_
 #define TESTS_INTEGRATION_SDL_SDLLABELS_HPP_
diff --git a/tests/integration/sdl/sdlwidgets.cpp b/tests/integration/sdl/sdlwidgets.cpp
@@ -171,11 +171,10 @@ void Application::cleanup()
             bool ownedByExample = (child == ownedTextBox.get() || child == ownedNestedContainer.get());
             if (!ownedByExample) {
                 // skip widgets that are stored in tabWidgets (tabs and their content)
-                for (auto const & wptr : tabWidgets) {
-                    if (wptr.get() == child) {
-                        ownedByExample = true;
-                        break;
-                    }
+                if (std::any_of(tabWidgets.begin(), tabWidgets.end(), [child](auto const & wptr) {
+                        return wptr.get() == child;
+                    })) {
+                    ownedByExample = true;
                 }
             }
             if (ownedByExample) {
diff --git a/tests/integration/sdl/sdlwidgets.hpp b/tests/integration/sdl/sdlwidgets.hpp
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <memory>
 #include <string>
+#include <vector>
 
 // Third-party library includes
 #include <SDL2/SDL.h>
diff --git a/tests/integration/sdlmdedit/main.cpp b/tests/integration/sdlmdedit/main.cpp
@@ -1,23 +1,35 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
-// SPDX-FileCopyrightText: 2004 - 2008 Olof Naessén and Per Larsson
-// SPDX-FileCopyrightText: 2013 - 2026 Fifengine contributors
+// SPDX-FileCopyrightText: 2026 Fifengine contributors
 
 /**
  * SDL Markdown Editor Demo
  *
  * This demo application validates the new widget elements:
+ * - MenuBar
+ *   - Menu, Menuitem, MenuPopup
  * - StatusBar
+ *   - BarSection
  * - ActivityBar
- * - PrimaryPanel/SecondaryPanel
- * - MenuBar
- * - MenuPopup/MenuItem
+ *   - ActivityBarItem
+ * - Panel
+ *   - PrimaryPanel
+ *   - SecondaryPanel
+ *
+ * The demo also uses a Glyph font to demonstrate the usage of
+ * glyph icons in the menu and activity bar.
  */
 
 // Corresponding header include
 #include "sdlmdedit.hpp"
 
 // Standard library includes
+#include <algorithm>
 #include <filesystem>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 // Third-party library includes
 #include <SDL2/SDL_ttf.h>
@@ -152,11 +164,11 @@ void Application::init_GUI(int width, int height)
         };
 
         std::filesystem::path chosen;
-        for (auto const & p : candidates) {
-            if (std::filesystem::exists(p)) {
-                chosen = p;
-                break;
-            }
+        auto it = std::find_if(candidates.begin(), candidates.end(), [](auto const & p) {
+            return std::filesystem::exists(p);
+        });
+        if (it != candidates.end()) {
+            chosen = *it;
         }
 
         if (chosen.empty()) {
@@ -193,11 +205,11 @@ void Application::init_GUI(int width, int height)
         };
 
         std::filesystem::path openmoji;
-        for (auto const & p : candidates) {
-            if (std::filesystem::exists(p)) {
-                openmoji = p;
-                break;
-            }
+        auto it = std::find_if(candidates.begin(), candidates.end(), [](auto const & p) {
+            return std::filesystem::exists(p);
+        });
+        if (it != candidates.end()) {
+            openmoji = *it;
         }
 
         if (!openmoji.empty()) {
@@ -302,11 +314,11 @@ void Application::init_GUI(int width, int height)
             };
 
             std::filesystem::path openmoji;
-            for (auto const & p : candidates) {
-                if (std::filesystem::exists(p)) {
-                    openmoji = p;
-                    break;
-                }
+            auto it = std::find_if(candidates.begin(), candidates.end(), [](auto const & p) {
+                return std::filesystem::exists(p);
+            });
+            if (it != candidates.end()) {
+                openmoji = *it;
             }
 
             if (!openmoji.empty()) {
diff --git a/tests/integration/sdlmdedit/sdlmdedit.hpp b/tests/integration/sdlmdedit/sdlmdedit.hpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later OR BSD-3-Clause
-// SPDX-FileCopyrightText: 2004 - 2008 Olof Naessén and Per Larsson
-// SPDX-FileCopyrightText: 2013 - 2026 Fifengine contributors
+// SPDX-FileCopyrightText: 2026 Fifengine contributors
 
 #ifndef SDLMDEdit_HPP
 #define SDLMDEdit_HPP
