This commit is contained in:
john stone 2014-02-23 18:04:52 +01:00
parent e9c7f79bc3
commit 8c28d1adb8
3 changed files with 12 additions and 9 deletions

View File

@ -19,6 +19,6 @@ class DynamicObjects
private:
std::string _cleanpath (const char * const path);
std::map<unsigned int, Sicobject *> _themap;
Routerin * _merouterin;
const Routerin * _merouterin;
};

View File

@ -17,7 +17,7 @@ static const std::string std_html_header= u8R"HUENERBLUBBE(<!DOCTYPE html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Sharing is Caring</title>
<link rel="stylesheet" type="text/css" href="style.css">
<link rel="stylesheet" type="text/css" href="static/style.css">
</head>
)HUENERBLUBBE" ;

View File

@ -6,23 +6,26 @@
#include <iostream>
#include <cassert>
#include "Sicmaster.H"
#include "Routerin.H"
class Routerin;
class Sicobject
{
public:
Sicobject() = delete; //was war noch mal ein explicit constructor?
Sicobject(Sicmaster & master) :
_sicmaster(master),
Sicobject() = delete;
Sicobject(const Routerin * master) :
_routerin(master),
_isvalid(false)
{
};
Sicobject(Sicmaster &master, unsigned int idnum, std::string fname,size_t objsize,time_t upl_date) :
Sicobject(const Routerin *master, unsigned int idnum, std::string fname,size_t objsize,time_t upl_date) :
_size(objsize),
_idnum(idnum),
_sicmaster(master),
_routerin(master),
_isvalid(true),
_upl_date(upl_date),
_fname(fname)
@ -64,7 +67,7 @@ class Sicobject
private:
size_t _size;
unsigned int _idnum;
Sicmaster & _sicmaster;
const Routerin * _routerin;
bool _isvalid;
time_t _upl_date;
std::string _fname;