tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

now winix is using 'pikotools' (confparser, utf8, mainparser)

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-01-12 02:24:08 +00:00
parent cb33f20a24
commit b2d3ca9543
55 changed files with 1749 additions and 1884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1244
functions/Makefile.dep
View File

File diff suppressed because it is too large Load Diff

2
functions/env.cpp
View File

@@ -49,7 +49,7 @@ bool Env::Parse(const std::wstring & env_str)
conf_parser.UTF8(config->utf8);
conf_parser.SplitSingle(true);
return (conf_parser.ParseString(env_str) == ConfParser::ok);
return (conf_parser.ParseString(env_str) == PT::ConfParser::ok);
}

6
functions/env.h
View File

@@ -11,7 +11,7 @@
#define headerfile_winix_functions_env
#include "functionbase.h"
#include "core/confparser.h"
#include "confparser/confparser.h"
namespace Fun
@@ -36,8 +36,8 @@ public:
private:
ConfParser conf_parser;
Space space;
PT::ConfParser conf_parser;
PT::Space space;
User * puser;
size_t req_id;

4
functions/functionbase.h
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2010-2011, Tomasz Sowa
* Copyright (c) 2010-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -19,7 +19,7 @@
#include "core/system.h"
#include "core/synchro.h"
#include "notify/notify.h"
#include "utf8.h"
class Functions;

6
functions/functionparser.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2011, Tomasz Sowa
* Copyright (c) 2008-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -12,7 +12,7 @@
#include "core/item.h"
#include "core/error.h"
#include "functions.h"
#include "utf8.h"
#include "utf8/utf8.h"
@@ -330,7 +330,7 @@ void FunctionParser::ToWide(const std::string & src, std::wstring & dst)
dst.clear();
if( utf8 )
Ezc::UTF8ToWide(src, dst, false);
PT::UTF8ToWide(src, dst, false);
else
AssignString(src, dst, false);
}

6
functions/login.cpp
View File

@@ -2,13 +2,13 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2011, Tomasz Sowa
* Copyright (c) 2008-2012, Tomasz Sowa
* All rights reserved.
*
*/
#include "login.h"
#include "utf8.h"
#include "utf8/utf8.h"
#include "core/plugin.h"
@@ -40,7 +40,7 @@ bool Login::CheckPasswords(const std::wstring & password)
{
if( system->crypt.RSA(false, config->pass_rsa_private_key, up.pass_encrypted, pass_decrypted) )
{
Ezc::UTF8ToWide(pass_decrypted, up.pass);
PT::UTF8ToWide(pass_decrypted, up.pass);
}
else
{

4
functions/meta.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* Copyright (c) 2011-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -34,7 +34,7 @@ bool Meta::AddMetaInfo(Item & item, const std::wstring & meta_str)
conf_parser.UTF8(config->utf8);
conf_parser.SplitSingle(true);
if( conf_parser.ParseString(meta_str) == ConfParser::ok )
if( conf_parser.ParseString(meta_str) == PT::ConfParser::ok )
{
if( db->EditMetaById(space, item.id) == WINIX_ERR_OK )
{

8
functions/meta.h
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2011, Tomasz Sowa
* Copyright (c) 2011-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -11,7 +11,7 @@
#define headerfile_winix_functions_meta
#include "functionbase.h"
#include "core/confparser.h"
#include "confparser/confparser.h"
namespace Fun
@@ -30,8 +30,8 @@ public:
private:
ConfParser conf_parser;
Space space;
PT::ConfParser conf_parser;
PT::Space space;
};

4
functions/upload.cpp
View File

@@ -2,7 +2,7 @@
* This file is a part of Winix
* and is not publicly distributed
*
* Copyright (c) 2008-2011, Tomasz Sowa
* Copyright (c) 2008-2012, Tomasz Sowa
* All rights reserved.
*
*/
@@ -16,7 +16,7 @@
#include "core/plugin.h"
#include "functions/functions.h"
#include "templates/templates.h"
#include "utf8.h"
#include "utf8/utf8.h"