Fix mvvm

Author: urbytes21

src/ap/mvc/model/SharedData.cpp

@@ -9,7 +9,7 @@ void SharedData::setData(const std::string& data) {
 }
 
 void SharedData::notifyObservers() {
-  for (auto *o : observers_) {
+  for (auto* o : observers_) {
     o->onDataChanged(this->data_);
   }
 }

src/ap/mvc/mvc_ap.cpp

@@ -5,6 +5,7 @@
 #include "view/DisplayWidget.h"
 #include "view/EditorWidget.h"
 
+namespace mvc {
 class ContainerWindow : public Gtk::Window {
  public:
   ContainerWindow();
@@ -67,8 +68,9 @@ ContainerWindow::ContainerWindow()
   mainLayout_.append(*editorView_);   // Add bottom row
   set_child(mainLayout_);
 }
+}  // namespace mvc
 
 int main(int argc, char* argv[]) {
   auto app = Gtk::Application::create("org.gtkmm.example.singlemvc");
-  return app->make_window_and_run<ContainerWindow>(argc, argv);
+  return app->make_window_and_run<mvc::ContainerWindow>(argc, argv);
 }

src/ap/mvvm/model/SharedData.cpp

@@ -1,22 +1,22 @@
 #include "SharedData.h"
 
-SharedData::SharedData() : data_{"Initial Data"} {}
+mvvm::SharedData::SharedData() : data_{"Initial Data"} {}
 
-void SharedData::setData(const std::string& data) {
+void mvvm::SharedData::setData(const std::string& data) {
   this->data_ = data;
   notifyObservers();
 }
 
-void SharedData::notifyObservers() {
+void mvvm::SharedData::notifyObservers() {
   for (auto* o : observers_) {
     o->onDataChanged(this->data_);
   }
 }
-void SharedData::addObserver(IObserver* obs) {
+void mvvm::SharedData::addObserver(IObserver* obs) {
   if (obs != nullptr)
     observers_.push_back(obs);
 }
 
-std::string SharedData::getData() const {
+std::string mvvm::SharedData::getData() const {
   return data_;
 }

src/ap/mvvm/model/SharedData.h

@@ -3,6 +3,7 @@
 #include <vector>
 #include "../IObserver.h"
 
+namespace mvvm {
 class SharedData {
  public:
   SharedData();
@@ -17,4 +18,5 @@ class SharedData {
 
   std::string data_;
   std::vector<IObserver*> observers_;
-};
+};
+}  // namespace mvvm

src/ap/mvvm/mvvm_ap.cpp

@@ -5,12 +5,13 @@
 #include "view/EditorWidget.h"
 #include "viewmodel/SharedDataVM.h"
 
+namespace mvvm {
 /**
  * @brief ContainerWindow wires up the MVVM triad:
  * Key differences from MVC's ContainerWindow:
  *  1. No Controller is created.
  *  2. No manual addObserver() calls, each View self-registers with the ViewModel during construction.
- *  3. Views receive a shared_ptr<SharedDataViewModel>, never a Model pointer.
+ *  3. Views receive a shared_ptr<SharedDataVM>, never a Model pointer.
  */
 class ContainerWindow : public Gtk::Window {
  public:
@@ -35,7 +36,7 @@ class ContainerWindow : public Gtk::Window {
 ContainerWindow::ContainerWindow()
     : mainLayout_(Gtk::Orientation::VERTICAL),
       topRowLayout_(Gtk::Orientation::HORIZONTAL) {
-  set_title("MVC Integrated Demo");
+  set_title("MVVM Integrated Demo");
   set_default_size(600, 400);
 
   // Step 1 – construct the Model.
@@ -51,10 +52,6 @@ ContainerWindow::ContainerWindow()
   displayViewRight_ = std::make_unique<DisplayWidget>("ZONE 3: MONITOR B (Red)",
                                                       "red", viewModel_);
 
-  dataModel_->addObserver(editorView_.get());
-  dataModel_->addObserver(displayViewLeft_.get());
-  dataModel_->addObserver(displayViewRight_.get());
-
   // Layout, unchanged from MVC
   displayViewLeft_->set_hexpand(true);
   displayViewRight_->set_hexpand(true);
@@ -66,8 +63,9 @@ ContainerWindow::ContainerWindow()
   mainLayout_.append(*editorView_);
   set_child(mainLayout_);
 }
+}  // namespace mvvm
 
 int main(int argc, char* argv[]) {
   auto app = Gtk::Application::create("org.gtkmm.example.singlemvvm");
-  return app->make_window_and_run<ContainerWindow>(argc, argv);
+  return app->make_window_and_run<mvvm::ContainerWindow>(argc, argv);
 }

src/ap/mvvm/view/DisplayWidget.cpp

@@ -1,9 +1,9 @@
 #include "DisplayWidget.h"
 
-DisplayWidget::DisplayWidget(const std::string& title, const std::string& color,
-                             std::shared_ptr<SharedDataVM> vm)
+mvvm::DisplayWidget::DisplayWidget(const std::string& title, std::string color,
+                                   std::shared_ptr<SharedDataVM> vm)
     : Gtk::Box(Gtk::Orientation::VERTICAL),
-      color_(color),
+      color_(std::move(color)),
       innerBox_(Gtk::Orientation::VERTICAL),
       view_model_(std::move(vm)) {
   frame_.set_label(title);
@@ -22,12 +22,12 @@ DisplayWidget::DisplayWidget(const std::string& title, const std::string& color,
   view_model_->addObserver(this);
 }
 
-void DisplayWidget::updateLabel(const std::string& text) {
+void mvvm::DisplayWidget::updateLabel(const std::string& text) {
   std::string markup = "<span foreground='" + color_ +
                        "' size='x-large' weight='bold'>" + text + "</span>";
   labelData_.set_markup(markup);
 }
 
-void DisplayWidget::onDataChanged(const std::string& newData) {
+void mvvm::DisplayWidget::onDataChanged(const std::string& newData) {
   updateLabel(newData);
 }

src/ap/mvvm/view/DisplayWidget.h

@@ -3,9 +3,10 @@
 #include "../IObserver.h"
 #include "../viewmodel/SharedDataVM.h"
 
+namespace mvvm {
 class DisplayWidget : public Gtk::Box, public IObserver {
  public:
-  DisplayWidget(const std::string& title, const std::string& color,
+  DisplayWidget(const std::string& title, std::string color,
                 std::shared_ptr<SharedDataVM> vm);
 
   void onDataChanged(const std::string& newData) override;
@@ -19,4 +20,5 @@ class DisplayWidget : public Gtk::Box, public IObserver {
   Gtk::Label labelData_;
 
   std::shared_ptr<SharedDataVM> view_model_;
-};
+};
+}  // namespace mvvm

src/ap/mvvm/view/EditorWidget.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>
 
-EditorWidget::EditorWidget(std::shared_ptr<SharedDataVM> vm)
+mvvm::EditorWidget::EditorWidget(std::shared_ptr<SharedDataVM> vm)
     : Gtk::Box(Gtk::Orientation::VERTICAL),
       innerBox_(Gtk::Orientation::VERTICAL),
       view_model_(std::move(vm)) {
@@ -30,7 +30,7 @@ EditorWidget::EditorWidget(std::shared_ptr<SharedDataVM> vm)
   view_model_->addObserver(this);
 }
 
-void EditorWidget::onDataChanged(const std::string& newData) {
+void mvvm::EditorWidget::onDataChanged(const std::string& newData) {
   if (entry_.get_text() != Glib::ustring(newData)) {
     entry_.set_text(newData);
   }

src/ap/mvvm/view/EditorWidget.h

@@ -4,6 +4,7 @@
 #include "../IObserver.h"
 #include "../viewmodel/SharedDataVM.h"
 
+namespace mvvm {
 class EditorWidget : public Gtk::Box, public IObserver {
  public:
   explicit EditorWidget(std::shared_ptr<SharedDataVM> vm);
@@ -18,4 +19,5 @@ class EditorWidget : public Gtk::Box, public IObserver {
   Gtk::Button button_;
 
   std::shared_ptr<SharedDataVM> view_model_;
-};
+};
+}  // namespace mvvm

src/ap/mvvm/viewmodel/SharedDataVM.cpp

@@ -1,31 +1,31 @@
 #include "SharedDataVM.h"
 
-SharedDataVM::SharedDataVM(std::shared_ptr<SharedData> model)
+mvvm::SharedDataVM::SharedDataVM(std::shared_ptr<SharedData> model)
     : model_(std::move(model)) {
   model_->addObserver(this);
 }
 
-void SharedDataVM::submitText(const std::string& text) {
+void mvvm::SharedDataVM::submitText(const std::string& text) {
   if (text.empty())
     return;
 
   model_->setData(text);
 }
 
-std::string SharedDataVM::getCurrentText() const {
+std::string mvvm::SharedDataVM::getCurrentText() const {
   return model_->getData();
 }
 
-void SharedDataVM::addObserver(IObserver* obs) {
+void mvvm::SharedDataVM::addObserver(IObserver* obs) {
   if (obs != nullptr)
     view_observers_.push_back(obs);
 }
 
-void SharedDataVM::onDataChanged(const std::string& newData) {
+void mvvm::SharedDataVM::onDataChanged(const std::string& newData) {
   notifyObservers(newData);
 }
 
-void SharedDataVM::notifyObservers(const std::string& data) {
+void mvvm::SharedDataVM::notifyObservers(const std::string& data) {
   for (auto* obs : view_observers_) {
     obs->onDataChanged(data);
   }