changes

src/system/connect.cpp

@@ -1,8 +1,6 @@
 #include "connect.hpp"
 
-Connection::Connection(std::string name) : SystemElement(name) {
-
-};
+Connection::Connection(std::string name) : SystemElement(name) {};
 
 Connections::Connections(void): SystemElementContainer<Connection>("connections") {}
 

src/system/modules.cpp

@@ -1,8 +1,6 @@
 #include "modules.hpp"
 
-Module::Module(std::string name) : SystemElement(name) {
-
-};
+Module::Module(std::string name) : SystemElementContainer<Part>(name) {};
 
 Modules::Modules(void): SystemElementContainer<Module>("modules") {}
 

src/system/modules.hpp

@@ -1,9 +1,10 @@
-#ifndef _PINS_HPP_
-#define _PINS_HPP_
+#ifndef _MODULES_HPP_
+#define _MODULES_HPP_
 
 #include "syselmts.hpp"
+#include "parts.hpp"
 
-class Module : public SystemElement
+class Module : public SystemElementContainer<Part>
 {
 public:
     Module(std::string name);
@@ -16,4 +17,4 @@ public:
     Modules(std::vector<Module> pins);
 };
 
-#endif // _PINS_HPP_
+#endif // _MODULES_HPP_

src/system/parts.cpp

@@ -1,8 +1,6 @@
 #include "parts.hpp"
 
-Part::Part(std::string name) : SystemElement(name) {
-
-};
+Part::Part(std::string name) : SystemElementContainer<Pin>(name) {};
 
 Parts::Parts(void): SystemElementContainer<Part>("parts") {}
 

src/system/parts.hpp

@@ -2,8 +2,9 @@
 #define _PARTS_HPP_
 
 #include "syselmts.hpp"
+#include "pins.hpp"
 
-class Part : public SystemElement
+class Part : public SystemElementContainer<Pin>
 {
 public:
     Part(std::string name);

src/system/pins.cpp

@@ -1,8 +1,6 @@
 #include "pins.hpp"
 
-Pin::Pin(std::string name) : SystemElement(name) {
-
-};
+Pin::Pin(std::string name) : SystemElement(name) {};
 
 Pins::Pins(void): SystemElementContainer<Pin>("pins") {}
 

src/system/signals.cpp

@@ -1,9 +1,7 @@
 
 #include "signals.hpp"
 
-Signal::Signal(std::string name) : SystemElement(name) {
-
-};
+Signal::Signal(std::string name) : SystemElementContainer<Pin>(name) {};
 
 Signals::Signals(void): SystemElementContainer<Signal>("signals") {}
 

src/system/signals.hpp

@@ -2,8 +2,9 @@
 #define _SIGNALS_HPP_
 
 #include "syselmts.hpp"
+#include "pins.hpp"
 
-class Signal : public SystemElement
+class Signal : public SystemElementContainer<Pin>
 {
 public:
     Signal(std::string name);

src/system/syselmts.hpp

@@ -44,6 +44,10 @@ public:
         }
         content.insert({element.name, element});
     }
+    void add(SystemElementContainer<T> elements)
+    {
+        add(elements.content);
+    }
     void add(std::vector<T> elements)
     {
         for (auto &element : elements)

src/system/system.cpp

@@ -1,9 +1,7 @@
 
 #include "system.hpp"
 
-using namespace std;
-
-System::System(void): mods(nullptr), conns(nullptr) {
+System::System(): mods(nullptr), conns(nullptr) {
     mods = new Modules();
     conns = new Connections();
 }
@@ -11,8 +9,4 @@ System::System(void): mods(nullptr), conns(nullptr) {
 System::~System() {
     delete mods;
     delete conns;
-}
-
-void System::add_mentor(ifstream lines) {
-
 }

src/system/system.hpp

@@ -4,15 +4,14 @@
 #include "connect.hpp"
 #include "modules.hpp"
 
-
 class System
 {
     Modules *mods;
     Connections *conns;
 
 public:
-    System(void);
-    void add_mentor(std::ifstream lines);
+    System();
+    ~System();
 };
 
 #endif // _SYSTEM_HPP_