code cleanup (compiler & attributes)

Author: forgottosave

src/core/OSTreeTUI.cpp

@@ -186,7 +186,7 @@ void OSTreeTUI::RefreshCommitComponents() {
 
     commitComponents.clear();
     commitComponents.push_back(TrashBin::TrashBinComponent(*this));
-    int i{0};
+    size_t i{0};
     parseVisibleCommitMap();
     for (auto& hash : visibleCommitViewMap) {
         commitComponents.push_back(CommitRender::CommitComponent(i, hash, *this));
@@ -300,7 +300,8 @@ void OSTreeTUI::parseVisibleCommitMap() {
 void OSTreeTUI::adjustScrollToSelectedCommit() {
     // try to scroll it to the middle
     int windowHeight = screen.dimy() - 4;
-    int scollOffsetToFitCommitToTop = -selectedCommit * CommitRender::COMMIT_WINDOW_HEIGHT;
+    int scollOffsetToFitCommitToTop =
+        -static_cast<int>(selectedCommit) * CommitRender::COMMIT_WINDOW_HEIGHT;
     int newScroll =
         scollOffsetToFitCommitToTop + windowHeight / 2 - CommitRender::COMMIT_WINDOW_HEIGHT;
     // adjust if on edges

src/core/commit.cpp

@@ -75,14 +75,14 @@ Element DefaultRenderState(const WindowRenderState& state,
 /// https://github.com/ArthurSonzogni/FTXUI/blob/main/src/ftxui/component/window.cpp
 class CommitComponentImpl : public ComponentBase, public WindowOptions {
    public:
-    explicit CommitComponentImpl(int position, std::string commit, OSTreeTUI& ostreetui)
-        : commitPosition(position),
+    explicit CommitComponentImpl(size_t position, std::string commit, OSTreeTUI& ostreetui)
+        : drag_initial_x(1),
+          drag_initial_y(static_cast<int>(position) * COMMIT_WINDOW_HEIGHT),
+          commitPosition(position),
           hash(std::move(commit)),
           ostreetui(ostreetui),
           commit(ostreetui.GetOstreeRepo().GetCommitList().at(hash)),
-          newVersion(this->commit.version),
-          drag_initial_y(position * COMMIT_WINDOW_HEIGHT),
-          drag_initial_x(1) {
+          newVersion(this->commit.version) {
         inner = Renderer([&] {
             return vbox({
                 text(ostreetui.GetOstreeRepo().GetCommitList().at(hash).subject),
@@ -183,12 +183,10 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
             }
         } else if (ostreetui.GetViewMode() == ViewMode::COMMIT_DROP &&
                    ostreetui.GetModeHash() == hash) {
-            const auto& commitList = ostreetui.GetOstreeRepo().GetCommitList();
-            auto commit = commitList.at(hash);
             startDeletionWindow(ostreetui.GetOstreeRepo().IsMostRecentCommitOnBranch(hash));
         }
 
-        auto element = ComponentBase::Render();
+        ftxui::Element element = ComponentBase::Render();
 
         const WindowRenderState state = {element, title(), Active(), drag_};
 
@@ -371,7 +369,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
     bool drag_ = false;
 
     // ostree-tui specific members
-    int commitPosition;
+    size_t commitPosition;
     std::string hash;
     OSTreeTUI& ostreetui;
 
@@ -445,7 +443,7 @@ class CommitComponentImpl : public ComponentBase, public WindowOptions {
 
 }  // namespace
 
-ftxui::Component CommitComponent(int position, const std::string& commit, OSTreeTUI& ostreetui) {
+ftxui::Component CommitComponent(size_t position, const std::string& commit, OSTreeTUI& ostreetui) {
     return ftxui::Make<CommitComponentImpl>(position, commit, ostreetui);
 }
 

src/core/commit.hpp

@@ -32,7 +32,7 @@ constexpr int COMMIT_WINDOW_HEIGHT{4};
 constexpr int COMMIT_WINDOW_WIDTH{32};
 constexpr int PROMOTION_WINDOW_HEIGHT{COMMIT_WINDOW_HEIGHT + 11};
 constexpr int PROMOTION_WINDOW_WIDTH{COMMIT_WINDOW_WIDTH + 8};
-constexpr int DELETION_WINDOW_HEIGHT{COMMIT_WINDOW_HEIGHT + 9};
+constexpr int DELETION_WINDOW_HEIGHT{COMMIT_WINDOW_HEIGHT + 8};
 constexpr int DELETION_WINDOW_WIDTH{COMMIT_WINDOW_WIDTH + 8};
 // render tree types
 enum RenderTree : uint8_t {
@@ -51,7 +51,7 @@ enum RenderTree : uint8_t {
  *
  * @return UI Component
  */
-[[nodiscard]] ftxui::Component CommitComponent(int position,
+[[nodiscard]] ftxui::Component CommitComponent(size_t position,
                                                const std::string& commit,
                                                OSTreeTUI& ostreetui);
 

src/core/manager.cpp

@@ -53,7 +53,9 @@ BranchBoxManager::BranchBoxManager(OSTreeTUI& ostreetui,
                                    std::unordered_map<std::string, bool>& visibleBranches) {
     using namespace ftxui;
 
-    CheckboxOption cboption = {.on_change = [&] { ostreetui.RefreshCommitListComponent(); }};
+    CheckboxOption cboption = CheckboxOption::Simple();
+    cboption.on_change = [&] { ostreetui.RefreshCommitListComponent(); };
+    // CheckboxOption cboption = {.on_change = [&] { ostreetui.RefreshCommitListComponent(); }};
 
     // branch visibility
     for (const auto& branch : repo.GetBranches()) {

src/core/trashBin.cpp

@@ -87,7 +87,7 @@ class TrashBinComponentImpl : public ComponentBase, public WindowOptions {
         return element;
     }
 
-    bool OnEvent(Event event) final { return false; }
+    bool OnEvent(Event /*event*/) final { return false; }
 
    private:
     OSTreeTUI& ostreetui;

src/util/cpplibostree.cpp

@@ -365,7 +365,7 @@ bool OSTreeRepo::ResetBranchHeadAndPrune(const std::string& branch) {
 }
 
 bool OSTreeRepo::runCLICommand(const std::string& command) {
-    std::unique_ptr<FILE, decltype(&pclose)> pipe(popen(command.c_str(), "r"), pclose);
+    std::unique_ptr<FILE, int (*)(FILE*)> pipe(popen(command.c_str(), "r"), &pclose);
     if (!pipe) {
         return false;
     }

src/util/cpplibostree.hpp

@@ -91,11 +91,11 @@ class OSTreeRepo {
     OstreeRepo* _c();
 
     /// Getter
-    const std::string& GetRepoPath() const;
+    [[nodiscard]] const std::string& GetRepoPath() const;
     /// Getter
-    const CommitList& GetCommitList() const;
+    [[nodiscard]] const CommitList& GetCommitList() const;
     /// Getter
-    const std::vector<std::string>& GetBranches() const;
+    [[nodiscard]] const std::vector<std::string>& GetBranches() const;
 
     // Methods
 
@@ -115,7 +115,7 @@ class OSTreeRepo {
      * @return true if the commit is signed
      * @return false if the commit is not signed
      */
-    static bool IsCommitSigned(const Commit& commit);
+    [[nodiscard]] static bool IsCommitSigned(const Commit& commit);
 
     // read & write access to OSTree repo:
 
@@ -166,23 +166,23 @@ class OSTreeRepo {
      * @param branch Branch to get most recent commit from.
      * @return Most recent commit of the specified branch.
      */
-    const Commit& GetMostRecentCommitOfBranch(const std::string& branch) const;
+    [[nodiscard]] const Commit& GetMostRecentCommitOfBranch(const std::string& branch) const;
 
     /**
      * @brief Checks if commit is the most recent commit on its branch
      *
      * @param commit Commit to check.
      * @return True, if commit is most recent on its branch.
      */
-    bool IsMostRecentCommitOnBranch(const Commit& commit) const;
+    [[nodiscard]] bool IsMostRecentCommitOnBranch(const Commit& commit) const;
 
     /**
      * @brief Checks if commit is the most recent commit on its branch
      *
      * @param hash Hash of the commit to check.
      * @return True, if commit is most recent on its branch.
      */
-    bool IsMostRecentCommitOnBranch(const std::string& hash) const;
+    [[nodiscard]] bool IsMostRecentCommitOnBranch(const std::string& hash) const;
 
    private:
     /**
@@ -217,7 +217,7 @@ class OSTreeRepo {
      *
      * @return std::string All branch names, separated by spaces
      */
-    std::string getBranchesAsString();
+    [[nodiscard]] std::string getBranchesAsString();
 
     /**
      * @brief Parse a libostree GVariant commit to a C++ commit struct.