some work on dependency injection

git-svn-id: svn://ttmath.org/publicrep/winix/branches/0.7.x@1147 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2018-11-21 17:51:15 +00:00
parent a2ffc1e81c
commit 89d303f375
64 changed files with 1734 additions and 1161 deletions

View File

@@ -52,6 +52,8 @@
#include "core/sessionmanager.h"
#include "core/htmlfilter.h"
#include "db/db.h"
#include "core/winixrequest.h"
namespace Winix
{
@@ -80,12 +82,15 @@ namespace TemplatesFunctions
extern Ezc::Stack empty_stack;
extern Db * db;
extern Cur * cur;
extern Config * config;
extern System * system;
extern Cur * cur; // will be removed when TemplateBase class will be implemented
extern Config * config; // will be removed when TemplateBase class will be implemented
extern System * system; // will be removed when TemplateBase class will be implemented
extern Functions * functions;
extern SessionManager * session_manager;
extern Log log; // will be removed when TemplateBase class will be implemented
extern Plugin * plugin; // will be removed when TemplateBase class will be implemented
extern bool gen_trim_white;
extern bool gen_skip_new_line;
extern bool gen_use_special_chars;
@@ -676,8 +681,9 @@ namespace TemplatesFunctions
class Templates
// will be similar like Functions
// concrete templates classes (based on TemplateBase) will be registered here
class Templates : public WinixRequest
{
public:
@@ -690,6 +696,8 @@ public:
void SetFunctions(Functions * pfunctions);
void SetSessionManager(SessionManager * psession_manager);
void set_dependency(WinixRequest * winix_request);
void Init();
void ClearAfterRequest();
void ReadTemplates();