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

git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
2012-01-12 02:24:08 +00:00
parent cb33f20a24
commit b2d3ca9543
55 changed files with 1749 additions and 1884 deletions
@@ -2,21 +2,20 @@

 edb.o: edb.h ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
 edb.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
-edb.o: ../../core/confparser.h ../../core/requesttypes.h ../../core/error.h
-edb.o: ../../core/confparser.h export.h ../../core/dirs.h
-edb.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-edb.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
-edb.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
-edb.o: ../../core/ugcontainer.h ../../core/log.h ../../core/textstream.h
-edb.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-edb.o: ../../core/request.h ../../core/error.h ../../core/config.h
-edb.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
-edb.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
-edb.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
-edb.o: ../../notify/notify.h ../../notify/notifypool.h
-edb.o: ../../templates/patterns.h ../../templates/locale.h
-edb.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-edb.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+edb.o: ../../core/requesttypes.h ../../core/error.h export.h
+edb.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
+edb.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
+edb.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
+edb.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
+edb.o: ../../core/textstream.h ../../core/logmanipulators.h ../../core/slog.h
+edb.o: ../../core/cur.h ../../core/request.h ../../core/error.h
+edb.o: ../../core/config.h ../../core/htmlfilter.h
+edb.o: ../../templates/htmltextstream.h ../../core/session.h
+edb.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
+edb.o: ../../core/mount.h ../../templates/locale.h ../../notify/notify.h
+edb.o: ../../notify/notifypool.h ../../templates/patterns.h
+edb.o: ../../templates/locale.h ../../templates/localefilter.h
+edb.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 edb.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 edb.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 edb.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -25,23 +24,22 @@ edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
 edb.o: ../../core/lastcontainer.h ../../templates/misc.h
 edb.o: ../../templates/htmltextstream.h ../../core/log.h
 exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
-exportinfo.o: ../../core/dirs.h ../../core/item.h ../../core/confparser.h
-exportinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
-exportinfo.o: ../../db/dbitemquery.h ../../core/item.h
-exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-exportinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-exportinfo.o: ../../core/log.h ../../core/textstream.h
-exportinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
-exportinfo.o: ../../core/request.h ../../core/requesttypes.h
-exportinfo.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
+exportinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
+exportinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
+exportinfo.o: ../../core/item.h ../../db/dbitemcolumns.h ../../core/user.h
+exportinfo.o: ../../core/group.h ../../core/dircontainer.h
+exportinfo.o: ../../core/ugcontainer.h ../../core/log.h
+exportinfo.o: ../../core/textstream.h ../../core/logmanipulators.h
+exportinfo.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
+exportinfo.o: ../../core/requesttypes.h ../../core/error.h
+exportinfo.o: ../../core/config.h ../../core/htmlfilter.h
 exportinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
 exportinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 exportinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-exportinfo.o: ../../templates/locale.h ../../core/confparser.h
-exportinfo.o: ../../notify/notify.h ../../notify/notifypool.h
-exportinfo.o: ../../templates/patterns.h ../../templates/locale.h
-exportinfo.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-exportinfo.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+exportinfo.o: ../../templates/locale.h ../../notify/notify.h
+exportinfo.o: ../../notify/notifypool.h ../../templates/patterns.h
+exportinfo.o: ../../templates/locale.h ../../templates/localefilter.h
+exportinfo.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 exportinfo.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 exportinfo.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 exportinfo.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -57,25 +55,23 @@ exportinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/error.h
 exportinfo.o: ../../core/dirs.h message.h exportthread.h
 exportthread.o: exportthread.h ../../core/basethread.h ../../core/synchro.h
 exportthread.o: message.h ../../core/log.h ../../core/misc.h
-exportthread.o: ../../core/item.h ../../core/confparser.h
-exportthread.o: ../../core/requesttypes.h ../../../ezc/src/utf8.h
+exportthread.o: ../../core/item.h ../../core/requesttypes.h
 init.o: ../../core/log.h ../../core/plugin.h ../../core/pluginmsg.h
 init.o: ../../core/log.h ../../core/textstream.h ../../core/logmanipulators.h
 init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
-init.o: ../../core/requesttypes.h ../../core/item.h ../../core/confparser.h
-init.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
+init.o: ../../core/requesttypes.h ../../core/item.h ../../core/error.h
+init.o: ../../core/config.h ../../core/htmlfilter.h
 init.o: ../../templates/htmltextstream.h ../../core/textstream.h
 init.o: ../../core/misc.h ../../core/session.h ../../core/user.h
 init.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
-init.o: ../../templates/locale.h ../../core/confparser.h ../../core/system.h
-init.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
-init.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
-init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
-init.o: ../../core/dircontainer.h ../../core/ugcontainer.h
-init.o: ../../notify/notify.h ../../notify/notifypool.h
-init.o: ../../templates/patterns.h ../../templates/locale.h
-init.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
-init.o: ../../../ezc/src/utf8.h ../../../ezc/src/generator.h
+init.o: ../../templates/locale.h ../../core/system.h ../../core/dirs.h
+init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
+init.o: ../../db/dbitemquery.h ../../core/item.h ../../db/dbitemcolumns.h
+init.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
+init.o: ../../core/ugcontainer.h ../../notify/notify.h
+init.o: ../../notify/notifypool.h ../../templates/patterns.h
+init.o: ../../templates/locale.h ../../templates/localefilter.h
+init.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
 init.o: ../../../ezc/src/pattern.h ../../../ezc/src/functions.h
 init.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
 init.o: ../../notify/notifythread.h ../../core/basethread.h
@@ -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.
 * 
 */
@@ -85,13 +85,13 @@ bool ExportInfo::DecodePass(Export & exp)
 {
 	if( exp.ftp_pass_type == 0 )
 	{
-		Ezc::UTF8ToWide(exp.ftp_pass_bin, exp.ftp_pass);
+		PT::UTF8ToWide(exp.ftp_pass_bin, exp.ftp_pass);
 	}
 	else
 	{
 		if( system->crypt.RSA(false, rsa_key, exp.ftp_pass_bin, pass_decrypted) )
 		{
-			Ezc::UTF8ToWide(pass_decrypted, exp.ftp_pass);
+			PT::UTF8ToWide(pass_decrypted, exp.ftp_pass);
 			system->crypt.ClearString(pass_decrypted);
 		}
 		else
@@ -293,7 +293,7 @@ void ExportInfo::AdditionalExport(const Item & item)
 }


-void ExportInfo::AdditionalExport(const Item & item, Space & meta)
+void ExportInfo::AdditionalExport(const Item & item, PT::Space & meta)
 {
 	if( meta.ListText(L"additional_export", additional_export) )
 	{
@@ -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.
 * 
 */
@@ -74,7 +74,7 @@ private:
 	bool SkipDir(long dir_id, std::wstring & dir);

 	void AdditionalExport(const Item & item);
-	void AdditionalExport(const Item & item, Space & meta);
+	void AdditionalExport(const Item & item, PT::Space & meta);
 	void AdditionalExport(const std::wstring & path);

 	bool HasRecurrenceId(long id);
@@ -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.
 * 
 */
@@ -14,7 +14,7 @@
 #include "exportthread.h"
 #include "core/log.h"
 #include "core/misc.h"
-#include "utf8.h"
+#include "utf8/utf8.h"



@@ -247,7 +247,7 @@ void ExportThread::Convert(const std::wstring & in, std::string & out, bool clea
 	Lock();

 	if( utf8 )
-		Ezc::WideToUTF8(in, out, clear);
+		PT::WideToUTF8(in, out, clear);
 	else
 		AssignString(in, out, clear);