Add move constructors and assignment operators

Implements move constructors and assignment operators for
the ProgressBar class.
Also moves existing constructor implementation in cpp file.

Author: daljit46

cpp/core/progressbar.cpp

@@ -16,6 +16,8 @@
 
 #include "progressbar.h"
 #include "app.h"
+#include <thread>
+#include <utility>
 
 // MSYS2 supports VT100, and file redirection is handled explicitly so this can be used globally
 #define CLEAR_LINE_CODE "\033[0K"
@@ -168,4 +170,65 @@ bool ProgressBar::set_update_method() {
   return stderr_to_file;
 }
 
+ProgressBar::ProgressBar(const std::string &text, size_t target, int log_level)
+    : first_time(true),
+      last_value(0),
+      show(std::this_thread::get_id() == ::MR::App::main_thread_ID && !progressbar_active &&
+           App::log_level >= log_level),
+      _text(text),
+      _ellipsis("..."),
+      _value(0),
+      current_val(0),
+      next_percent(0),
+      next_time(0.0),
+      _multiplier(0.0),
+      _text_has_been_modified(false) {
+  if (show) {
+    set_max(target);
+    progressbar_active = true;
+  }
+}
+
+ProgressBar::ProgressBar(ProgressBar &&other) noexcept
+    : show(other.show),
+      _text(std::move(other._text)),
+      _ellipsis(std::move(other._ellipsis)),
+      _value(other._value),
+      current_val(other.current_val),
+      next_percent(other.next_percent),
+      next_time(other.next_time),
+      _multiplier(other._multiplier),
+      timer(other.timer),
+      _text_has_been_modified(other._text_has_been_modified),
+      first_time(other.first_time),
+      last_value(other.last_value) {
+  other.show = false;
+}
+
+ProgressBar &MR::ProgressBar::operator=(ProgressBar &&other) noexcept {
+  if (this == &other) {
+    return *this;
+  }
+
+  // If the current object is managing an active progress bar, finish it.
+  if (show) {
+    done();
+  }
+
+  _text = std::move(other._text);
+  _ellipsis = std::move(other._ellipsis);
+  show = other.show;
+  _value = other._value;
+  current_val = other.current_val;
+  next_percent = other.next_percent;
+  next_time = other.next_time;
+  _multiplier = other._multiplier;
+  timer = other.timer;
+  _text_has_been_modified = other._text_has_been_modified;
+  first_time = other.first_time;
+  last_value = other.last_value;
+  other.show = false;
+  return *this;
+}
+
 } // namespace MR

cpp/core/progressbar.h

@@ -18,10 +18,12 @@
 
 #include <chrono>
 #include <condition_variable>
+#include <cstddef>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
+#include <utility>
 
 #include "app.h"
 #include "debug.h"
@@ -55,9 +57,11 @@ namespace MR {
 class ProgressBar {
 public:
   //! Create an unusable ProgressBar.
-  ProgressBar() : show(false) {}
+  explicit ProgressBar() = default;
   ProgressBar(const ProgressBar &p) = delete;
-  ProgressBar(ProgressBar &&p) = default;
+  ProgressBar &operator=(const ProgressBar &p) = delete;
+  ProgressBar(ProgressBar &&other) noexcept;
+  ProgressBar &operator=(ProgressBar &&other) noexcept;
 
   FORCE_INLINE ~ProgressBar() { done(); }
 
@@ -149,42 +153,23 @@ class ProgressBar {
   ;
   static void *data;
 
-  mutable bool first_time;
-  mutable size_t last_value;
+  mutable bool first_time = false;
+  mutable size_t last_value = 0;
 
 private:
-  const bool show;
+  bool show = false;
   std::string _text, _ellipsis;
-  size_t _value, current_val, next_percent;
-  double next_time;
-  float _multiplier;
+  size_t _value = 0, current_val = 0, next_percent = 0;
+  double next_time = 0.0;
+  float _multiplier = 0.0F;
   Timer timer;
-  bool _text_has_been_modified;
+  bool _text_has_been_modified = false;
 
   FORCE_INLINE void display_now() { display_func(*this); }
 
   static bool progressbar_active;
 };
 
-FORCE_INLINE ProgressBar::ProgressBar(const std::string &text, size_t target, int log_level)
-    : first_time(true),
-      last_value(0),
-      show(std::this_thread::get_id() == ::MR::App::main_thread_ID && !progressbar_active &&
-           App::log_level >= log_level),
-      _text(text),
-      _ellipsis("..."),
-      _value(0),
-      current_val(0),
-      next_percent(0),
-      next_time(0.0),
-      _multiplier(0.0),
-      _text_has_been_modified(false) {
-  if (show) {
-    set_max(target);
-    progressbar_active = true;
-  }
-}
-
 inline void ProgressBar::set_max(size_t target) {
   if (!show)
     return;