diff --git a/src/DynamicObjects.H b/src/DynamicObjects.H index acaadc8..abbfd23 100644 --- a/src/DynamicObjects.H +++ b/src/DynamicObjects.H @@ -1,20 +1,21 @@ #pragma once -#include #include "Routerin.H" +#include "sicccPersister.H" #include "sicccobject.H" +#include #include #include -class Routerin; +//class Routerin; class DynamicObjects { public: std::string render_object_list(); std::string cleanpath(const char * const); - DynamicObjects(Routerin * merouterin) : m_merouterin(merouterin){ }; - ~DynamicObjects() {}; + DynamicObjects(Routerin * merouterin); + ~DynamicObjects(); private: std::string _cleanpath (const char * const path); diff --git a/src/DynamicObjects.cc b/src/DynamicObjects.cc index a1c62f2..0da062a 100644 --- a/src/DynamicObjects.cc +++ b/src/DynamicObjects.cc @@ -25,4 +25,18 @@ std::string DynamicObjects::render_object_list(){ //Foobar.jpg 80 KB //42× seit 1.1.1970 0:00 Uhr //<--- TODO // + // + +DynamicObjects::DynamicObjects(Routerin * merouterin) : + m_merouterin(merouterin) +{ + + +} + + +DynamicObjects::~DynamicObjects() +{ + +} diff --git a/src/Routerin.H b/src/Routerin.H index 69660d0..a39d325 100644 --- a/src/Routerin.H +++ b/src/Routerin.H @@ -3,8 +3,9 @@ #include #include + #include "StaticFileHandler.H" -#include "DynamicObjects.H" +//#include "DynamicObjects.H" class DynamicObjects; diff --git a/src/Routerin.cc b/src/Routerin.cc index f9710ce..1afd1ec 100644 --- a/src/Routerin.cc +++ b/src/Routerin.cc @@ -4,7 +4,7 @@ #include #include "Foohash.H" #include "Routerin.H" - +#include "DynamicObjects.H" using std::strcmp; using std::cout; diff --git a/src/sicccPersister.H b/src/sicccPersister.H index 97ff339..4032339 100644 --- a/src/sicccPersister.H +++ b/src/sicccPersister.H @@ -106,7 +106,6 @@ class SicccPersister merouter(merouter) { root = json_object(); - perists_path = "./"; json_file_name = "foo.json"; // not the best default }; @@ -114,7 +113,6 @@ class SicccPersister merouter(merouter) { root = get_json_from_sicccobject(so); - perists_path = json_file_name = so.get_filename(); }