add no-discard attribute & small code cleanups

Author: forgottosave

src/core/OSTreeTUI.cpp

@@ -231,12 +231,12 @@ bool OSTreeTUI::SetPromotionMode(bool active, const std::string& hash, bool SetP
 }
 
 bool OSTreeTUI::PromoteCommit(const std::string& hash,
-                              const std::string& branch,
+                              const std::string& targetBranch,
                               const std::vector<std::string>& metadataStrings,
                               const std::string& newSubject,
                               bool keepMetadata) {
     bool success =
-        ostreeRepo.PromoteCommit(hash, branch, metadataStrings, newSubject, keepMetadata);
+        ostreeRepo.PromoteCommit(hash, targetBranch, metadataStrings, newSubject, keepMetadata);
     SetPromotionMode(false);
     // reload repository
     if (success) {
@@ -324,11 +324,11 @@ const std::unordered_map<std::string, ftxui::Color>& OSTreeTUI::GetBranchColorMa
     return branchColorMap;
 }
 
-const int& OSTreeTUI::GetScrollOffset() const {
+int OSTreeTUI::GetScrollOffset() const {
     return scrollOffset;
 }
 
-const bool& OSTreeTUI::GetInPromotionSelection() const {
+bool OSTreeTUI::GetInPromotionSelection() const {
     return inPromotionSelection;
 }
 
@@ -384,7 +384,7 @@ int OSTreeTUI::showHelp(const std::string& caller, const std::string& errorMessa
 int OSTreeTUI::showVersion() {
     using namespace ftxui;
 
-    auto versionText = text("ostree-tui 0.2.1");
+    auto versionText = text("ostree-tui 0.3.0");
 
     auto screen = Screen::Create(Dimension::Fit(versionText));
     Render(screen, versionText);

src/core/OSTreeTUI.hpp

@@ -66,14 +66,14 @@ class OSTreeTUI {
      * @brief Promotes a commit, by passing it to the cpplibostree and refreshing the UI.
      *
      * @param hash Hash of commit to be promoted.
-     * @param branch Branch to promote the commit to.
+     * @param targetBranch Branch to promote the commit to.
      * @param metadataStrings Optional additional metadata-strings to be set.
      * @param newSubject New commit subject.
      * @param keepMetadata Keep metadata of old commit.
      * @return promotion success
      */
     bool PromoteCommit(const std::string& hash,
-                       const std::string& branch,
+                       const std::string& targetBranch,
                        const std::vector<std::string>& metadataStrings = {},
                        const std::string& newSubject = "",
                        bool keepMetadata = true);
@@ -91,20 +91,20 @@ class OSTreeTUI {
     void SetSelectedCommit(size_t selectedCommit);
 
     // non-const GETTER
-    std::vector<std::string>& GetColumnToBranchMap();
-    ftxui::ScreenInteractive& GetScreen();
+    [[nodiscard]] std::vector<std::string>& GetColumnToBranchMap();
+    [[nodiscard]] ftxui::ScreenInteractive& GetScreen();
 
     // GETTER
-    const cpplibostree::OSTreeRepo& GetOstreeRepo() const;
-    const size_t& GetSelectedCommit() const;
-    const std::string& GetPromotionBranch() const;
-    const std::unordered_map<std::string, bool>& GetVisibleBranches() const;
-    const std::vector<std::string>& GetColumnToBranchMap() const;
-    const std::vector<std::string>& GetVisibleCommitViewMap() const;
-    const std::unordered_map<std::string, ftxui::Color>& GetBranchColorMap() const;
-    const int& GetScrollOffset() const;
-    const bool& GetInPromotionSelection() const;
-    const std::string& GetPromotionHash() const;
+    [[nodiscard]] const cpplibostree::OSTreeRepo& GetOstreeRepo() const;
+    [[nodiscard]] const size_t& GetSelectedCommit() const;
+    [[nodiscard]] const std::string& GetPromotionBranch() const;
+    [[nodiscard]] const std::unordered_map<std::string, bool>& GetVisibleBranches() const;
+    [[nodiscard]] const std::vector<std::string>& GetColumnToBranchMap() const;
+    [[nodiscard]] const std::vector<std::string>& GetVisibleCommitViewMap() const;
+    [[nodiscard]] const std::unordered_map<std::string, ftxui::Color>& GetBranchColorMap() const;
+    [[nodiscard]] int GetScrollOffset() const;
+    [[nodiscard]] bool GetInPromotionSelection() const;
+    [[nodiscard]] const std::string& GetPromotionHash() const;
 
    private:
     // model

src/core/commit.hpp

@@ -49,7 +49,9 @@ enum RenderTree : uint8_t {
  *
  * @return UI Component
  */
-ftxui::Component CommitComponent(int position, const std::string& commit, OSTreeTUI& ostreetui);
+[[nodiscard]] ftxui::Component CommitComponent(int position,
+                                               const std::string& commit,
+                                               OSTreeTUI& ostreetui);
 
 /**
  * @brief Creates a Renderer for the commit section.
@@ -59,8 +61,9 @@ ftxui::Component CommitComponent(int position, const std::string& commit, OSTree
  * @param selectedCommit Commit that should be marked as selected.
  * @return UI Element
  */
-ftxui::Element commitRender(OSTreeTUI& ostreetui,
-                            const std::unordered_map<std::string, ftxui::Color>& branchColorMap);
+[[nodiscard]] ftxui::Element commitRender(
+    OSTreeTUI& ostreetui,
+    const std::unordered_map<std::string, ftxui::Color>& branchColorMap);
 
 /**
  * @brief Builds a commit-tree line.
@@ -71,9 +74,10 @@ ftxui::Element commitRender(OSTreeTUI& ostreetui,
  * @param branchColorMap    Branch colors to use.
  * @return UI Element, one commit-tree line.
  */
-ftxui::Element addTreeLine(const RenderTree& treeLineType,
-                           const cpplibostree::Commit& commit,
-                           const std::unordered_map<std::string, int>& usedBranches,
-                           const std::unordered_map<std::string, ftxui::Color>& branchColorMap);
+[[nodiscard]] ftxui::Element addTreeLine(
+    const RenderTree& treeLineType,
+    const cpplibostree::Commit& commit,
+    const std::unordered_map<std::string, int>& usedBranches,
+    const std::unordered_map<std::string, ftxui::Color>& branchColorMap);
 
 }  // namespace CommitRender

src/core/manager.cpp

@@ -42,7 +42,7 @@ ftxui::Component Manager::getManagerRenderer() {
     return managerRenderer;
 }
 
-const int& Manager::getTabIndex() const {
+int Manager::getTabIndex() const {
     return tab_index;
 }
 

src/core/manager.hpp

@@ -35,7 +35,7 @@ class Manager {
 
    public:
     ftxui::Component getManagerRenderer();
-    const int& getTabIndex() const;
+    int getTabIndex() const;
 };
 
 class CommitInfoManager {
@@ -46,13 +46,10 @@ class CommitInfoManager {
      * @param displayCommit Commit to display the information of.
      * @return ftxui::Element
      */
-    static ftxui::Element renderInfoView(const cpplibostree::Commit& displayCommit);
+    [[nodiscard]] static ftxui::Element renderInfoView(const cpplibostree::Commit& displayCommit);
 };
 
 class BranchBoxManager {
-   public:
-    ftxui::Component branchBoxes = ftxui::Container::Vertical({});
-
    public:
     BranchBoxManager(OSTreeTUI& ostreetui,
                      cpplibostree::OSTreeRepo& repo,
@@ -63,5 +60,8 @@ class BranchBoxManager {
      *
      * @return ftxui::Element
      */
-    ftxui::Element branchBoxRender();
+    [[nodiscard]] ftxui::Element branchBoxRender();
+
+   public:
+    ftxui::Component branchBoxes = ftxui::Container::Vertical({});
 };