solved virtual inheritance exercise

Kr4pper · Kr4pper · commit 1d2937cc647a · 2025-02-21T17:19:27.000+01:00
diff --git a/exercises/virtual_inheritance/TextBox.cpp b/exercises/virtual_inheritance/TextBox.cpp
@@ -10,9 +10,9 @@ void Drawable::draw() const {
 Rectangle::Rectangle(int id, float width, float height) :
     Drawable(id), m_width(width), m_height(height) {}
 
-Text::Text(int id, const std::string &content) :
+Text::Text(int id, std::string content) :
     Drawable(id), m_content(content) {}
 
-TextBox::TextBox(const std::string &content,
+TextBox::TextBox(std::string content,
                  float width, float height) :
-    Rectangle(1, width, height), Text(2, content) {}
+    Drawable(3), Rectangle(1, width, height), Text(2, content) {}
diff --git a/exercises/virtual_inheritance/TextBox.hpp b/exercises/virtual_inheritance/TextBox.hpp
@@ -10,23 +10,23 @@ class Drawable {
     int m_id;
 };
 
-class Rectangle : public Drawable {
+class Rectangle : public virtual Drawable {
 public:
     Rectangle(int id, float width, float height);
 protected:
     float m_width;
     float m_height;
 };
 
-class Text : public Drawable {
+class Text : public virtual Drawable {
 public:
-    Text(int id, const std::string &content);
+    Text(int id, std::string content);
 protected:
     std::string m_content;
 };
 
 class TextBox : public Rectangle, public Text {
 public:
-    TextBox(const std::string &content,
+    TextBox(std::string content,
             float width, float height);
 };
diff --git a/exercises/virtual_inheritance/trymultiherit.cpp b/exercises/virtual_inheritance/trymultiherit.cpp
@@ -2,13 +2,11 @@
 #include <iostream>
 
 int main() {
-    // create a TextBox and call draw
-
-
-    // Fix the code to call both draws by using types
-
-
-    // try with virtual inheritance
-
+    TextBox box = TextBox {"test", 10, 10};
+    box.draw(); // errors initially
 
+    Rectangle &r = box;
+    r.draw();
+    Text &t = box;
+    t.draw();
 }
