From 08f07ce756af7666f4fd8bdc393449040f48a6e7 Mon Sep 17 00:00:00 2001
From: Jonas Zeunert <zeunert@rhrk.uni-kl.de>
Date: Mon, 6 May 2019 21:07:56 +0200
Subject: [PATCH] nearly reworked items

---
 FlippR-Driver/include/output/items/Flipper.h  | 3 ++-
 FlippR-Driver/include/output/items/Lamp.h     | 2 +-
 FlippR-Driver/include/output/items/Solenoid.h | 2 +-
 FlippR-Driver/include/output/items/Sound.h    | 2 +-
 FlippR-Driver/src/output/items/detail/Item.h  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/FlippR-Driver/include/output/items/Flipper.h b/FlippR-Driver/include/output/items/Flipper.h
index 45e64f5..93f8a66 100644
--- a/FlippR-Driver/include/output/items/Flipper.h
+++ b/FlippR-Driver/include/output/items/Flipper.h
@@ -8,6 +8,7 @@
 #ifndef _INCLUDE_FLIPPR_CODE_FLIPPER_H
 #define _INCLUDE_FLIPPR_CODE_FLIPPER_H
 
+#include "Item.h"
 namespace flippR_driver
 {
 namespace output
@@ -15,7 +16,7 @@ namespace output
 namespace items
 {
 
-class Flipper
+class Flipper : public virtual Item
 {
 public:
   virtual ~Flipper() = default;
diff --git a/FlippR-Driver/include/output/items/Lamp.h b/FlippR-Driver/include/output/items/Lamp.h
index 7c9c9a7..0782a94 100644
--- a/FlippR-Driver/include/output/items/Lamp.h
+++ b/FlippR-Driver/include/output/items/Lamp.h
@@ -17,7 +17,7 @@ namespace output
 namespace items
 {
 
-class Lamp : public Item
+class Lamp : public virtual Item
 {
 public:
   virtual ~Lamp() = default;
diff --git a/FlippR-Driver/include/output/items/Solenoid.h b/FlippR-Driver/include/output/items/Solenoid.h
index c509ba0..8a98261 100644
--- a/FlippR-Driver/include/output/items/Solenoid.h
+++ b/FlippR-Driver/include/output/items/Solenoid.h
@@ -18,7 +18,7 @@ namespace output
 namespace items
 {
 // todo get name? parent calss output_item?
-class Solenoid : public Item
+class Solenoid : public virtual Item
 {
 public:
   virtual ~Solenoid() = default;
diff --git a/FlippR-Driver/include/output/items/Sound.h b/FlippR-Driver/include/output/items/Sound.h
index bcde888..c2ddcee 100644
--- a/FlippR-Driver/include/output/items/Sound.h
+++ b/FlippR-Driver/include/output/items/Sound.h
@@ -17,7 +17,7 @@ namespace output
 namespace items
 {
 
-class Sound : public Item
+class Sound : public virtual Item
 {
 public:
 	virtual ~Sound() = default;
diff --git a/FlippR-Driver/src/output/items/detail/Item.h b/FlippR-Driver/src/output/items/detail/Item.h
index f14aeaf..85426cf 100644
--- a/FlippR-Driver/src/output/items/detail/Item.h
+++ b/FlippR-Driver/src/output/items/detail/Item.h
@@ -22,7 +22,7 @@ namespace items
 namespace detail
 {
 
-class Item : public items::Item
+class Item : public virtual items::Item
 {
 public:
   Item(std::string name);