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:
@@ -28,7 +28,7 @@ namespace Ticket
|
||||
struct TicketConfWrap
|
||||
{
|
||||
bool to_delete;
|
||||
std::string file_name;
|
||||
std::wstring file_name;
|
||||
TicketConf conf;
|
||||
|
||||
TicketConfWrap()
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
|
||||
// default: "progress"
|
||||
// can be set in config in option: ticket_form_progress_prefix
|
||||
std::string progress_prefix;
|
||||
std::wstring progress_prefix;
|
||||
|
||||
int mount_type_ticket;
|
||||
|
||||
@@ -102,8 +102,8 @@ private:
|
||||
Request * request;
|
||||
TicketParser ticket_parser;
|
||||
Item item_conf;
|
||||
std::string path_dir;
|
||||
std::string path_file;
|
||||
std::wstring path_dir;
|
||||
std::wstring path_file;
|
||||
|
||||
// for cur_conf_wrap and cur_conf
|
||||
const TicketConfWrap cur_conf_wrap_empty;
|
||||
@@ -111,8 +111,8 @@ private:
|
||||
|
||||
|
||||
static bool SortTicketsFun(const Ticket & t1, const Ticket & t2);
|
||||
bool GetConfContent(const std::string & path);
|
||||
bool ParseTicketConf(long mount_dir_id, const std::string & path);
|
||||
bool GetConfContent(const std::wstring & path);
|
||||
bool ParseTicketConf(long mount_dir_id, const std::wstring & path);
|
||||
void ReadTicketConf(Mounts & mounts, bool skip_existing_configs);
|
||||
void MarkAllConfToDelete();
|
||||
void DeleteAllMarkedConf();
|
||||
|
Reference in New Issue
Block a user