address review comments

Author: SandrineP

src/subcommand/status_subcommand.cpp

@@ -6,7 +6,6 @@
 
 #include "status_subcommand.hpp"
 #include "../wrapper/status_wrapper.hpp"
-#include "git2/diff.h"
 
 status_subcommand::status_subcommand(const libgit2_object&, CLI::App& app)
 {
@@ -27,15 +26,15 @@ status_subcommand::status_subcommand(const libgit2_object&, CLI::App& app)
     sub->callback([this]() { this->run(); });
 };
 
-std::string untracked_header = "Untracked files:\n";
+const std::string untracked_header = "Untracked files:\n";
 // "Untracked files:\n  (use \"git add <file>...\" to include in what will be committed)";
-std::string tobecommited_header = "Changes to be committed:\n";
+const std::string tobecommited_header = "Changes to be committed:\n";
 // "Changes to be committed:\n  (use \"git reset HEAD <file>...\" to unstage)";
-std::string ignored_header = "Ignored files:\n";
+const std::string ignored_header = "Ignored files:\n";
 // "Ignored files:\n  (use \"git add -f <file>...\" to include in what will be committed)"
-std::string notstagged_header = "Changes not staged for commit:\n";
+const std::string notstagged_header = "Changes not staged for commit:\n";
 // "Changes not staged for commit:\n  (use \"git add%s <file>...\" to update what will be committed)\n  (use \"git checkout -- <file>...\" to discard changes in working directory)"
-std::string nothingtocommit_message = "No changes added to commit";
+const std::string nothingtocommit_message = "No changes added to commit";
 // "No changes added to commit (use \"git add\" and/or \"git commit -a\")"
 
 struct status_messages
@@ -53,7 +52,7 @@ const std::map<git_status_t, status_messages> status_msg_map =   //TODO : check
     { GIT_STATUS_INDEX_RENAMED, {"R  ", "\t renamed:"} },
     { GIT_STATUS_INDEX_TYPECHANGE, {"T  ", "\t typechange:"} },
     { GIT_STATUS_WT_NEW, {"?? ", ""} },
-    { GIT_STATUS_WT_MODIFIED, {" M" , "\t modified:"} },
+    { GIT_STATUS_WT_MODIFIED, {" M " , "\t modified:"} },
     { GIT_STATUS_WT_DELETED, {" D ", "\t deleted:"} },
     { GIT_STATUS_WT_TYPECHANGE, {" T ", "\t typechange:"} },
     { GIT_STATUS_WT_RENAMED, {" R ", "\t renamed:"} },

src/utils/common.hpp

@@ -3,24 +3,24 @@
 #include <string>
 #include <utility>
 
-class noncopiable_nonmovable
+class noncopyable_nonmovable
 {
 public:
-    noncopiable_nonmovable(const noncopiable_nonmovable&) = delete;
-    noncopiable_nonmovable& operator=(const noncopiable_nonmovable&) = delete;
-    noncopiable_nonmovable(noncopiable_nonmovable&&) = delete;
-    noncopiable_nonmovable& operator=(noncopiable_nonmovable&&) = delete;
+    noncopyable_nonmovable(const noncopyable_nonmovable&) = delete;
+    noncopyable_nonmovable& operator=(const noncopyable_nonmovable&) = delete;
+    noncopyable_nonmovable(noncopyable_nonmovable&&) = delete;
+    noncopyable_nonmovable& operator=(noncopyable_nonmovable&&) = delete;
 
 protected:
-    noncopiable_nonmovable() = default;
-    ~noncopiable_nonmovable() = default;
+    noncopyable_nonmovable() = default;
+    ~noncopyable_nonmovable() = default;
 };
 
 template <class T>
 class wrapper_base
 {
 public:
-    using ressource_type = T;
+    using resource_type = T;
 
     wrapper_base(const wrapper_base&) = delete;
     wrapper_base& operator=(const wrapper_base&) = delete;
@@ -36,7 +36,7 @@ class wrapper_base
         return this;
     }
 
-    operator ressource_type*() const noexcept
+    operator resource_type*() const noexcept
     {
         return p_ressource;
     }
@@ -45,10 +45,10 @@ class wrapper_base
     // Allocation and deletion of p_ressource must be handled by inheriting class.
     wrapper_base() = default;
     ~wrapper_base() = default;
-    ressource_type* p_ressource = nullptr;
+    resource_type* p_ressource = nullptr;
 };
 
-class libgit2_object : private noncopiable_nonmovable
+class libgit2_object : private noncopyable_nonmovable
 {
 public: