added support for UTF-8
now the UTF-8 is a default charset git-svn-id: svn://ttmath.org/publicrep/winix/trunk@677 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -17,11 +17,11 @@
|
||||
#include "patterncacher.h"
|
||||
#include "ckeditorgetparser.h"
|
||||
#include "indexpatterns.h"
|
||||
#include "locale.h"
|
||||
#include "db/db.h"
|
||||
#include "core/config.h"
|
||||
#include "core/request.h"
|
||||
#include "core/system.h"
|
||||
#include "core/locale.h"
|
||||
#include "core/sessionmanager.h"
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ class Functions;
|
||||
|
||||
namespace TemplatesFunctions
|
||||
{
|
||||
using Ezc::Info;
|
||||
|
||||
enum Pat
|
||||
{
|
||||
@@ -47,7 +46,7 @@ namespace TemplatesFunctions
|
||||
extern Patterns patterns_fun;
|
||||
extern PatternCacher pattern_cacher;
|
||||
extern Locale locale;
|
||||
extern Ezc::Functions ezc_functions;
|
||||
extern Ezc::Functions<TextStream<std::wstring> > ezc_functions;
|
||||
extern CKEditorGetParser ckeditor_getparser;
|
||||
|
||||
extern Config * config;
|
||||
@@ -132,7 +131,7 @@ namespace TemplatesFunctions
|
||||
void item_content_type_is(Item & item, Info & i);
|
||||
void item_content_type_is(Info & i);
|
||||
void item_content_is_empty(Info & i);
|
||||
void item_print_content(std::ostringstream & out, const std::string & content, Item::ContentType content_type);
|
||||
void item_print_content(TextStream<std::wstring> & out, const std::wstring & content, Item::ContentType content_type);
|
||||
void item_print_content(Info & i);
|
||||
void item_privileges(Info & i);
|
||||
void item_dir(Info & i);
|
||||
@@ -378,13 +377,13 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
void ReadFile(TemplatesFunctions::Pat pat, const char * file);
|
||||
void ReadFileFun(size_t index, const char * file);
|
||||
void ReadFile(TemplatesFunctions::Pat pat, const wchar_t * file);
|
||||
void ReadFileFun(size_t index, const wchar_t * file);
|
||||
void ReadFunctionsTemplates();
|
||||
void SetLocale();
|
||||
|
||||
std::string temp;
|
||||
std::string fun_file;
|
||||
std::wstring temp;
|
||||
std::wstring fun_file;
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user