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

updated: to the new Pikotools API

Browse Source 
ConfParser is now SpaceParser
added:   to SessionManager
         Session * SessionManager::FindSession(long id)



git-svn-id: svn://ttmath.org/publicrep/winix/trunk@831 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2012-04-30 22:53:54 +00:00
parent fc33b4f882
commit c94b0311b6
38 changed files with 946 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/export/Makefile.dep
View File

@@ -2,9 +2,9 @@
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: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
edb.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
edb.o: ../../../pikotools/confparser/space.h export.h ../../core/dirs.h
edb.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
edb.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
edb.o: ../../../pikotools/space/space.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
@@ -26,7 +26,7 @@ edb.o: ../../core/config.h ../../core/users.h ../../core/ugcontainer.h
edb.o: ../../core/lastcontainer.h ../../core/log.h
exportinfo.o: ../../core/log.h exportinfo.h ../../core/system.h
exportinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
exportinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
exportinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
exportinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
exportinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h ../../core/item.h
exportinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -35,8 +35,8 @@ 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
exportinfo.o: ../../../pikotools/confparser/confparser.h
exportinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
exportinfo.o: ../../../pikotools/space/spaceparser.h
exportinfo.o: ../../../pikotools/space/space.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
@@ -58,15 +58,15 @@ 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 ../../../pikotools/confparser/space.h
exportthread.o: ../../core/item.h ../../../pikotools/space/space.h
exportthread.o: ../../core/requesttypes.h ../../../pikotools/utf8/utf8.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
init.o: ../../../pikotools/confparser/space.h ../../core/error.h
init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../../pikotools/space/space.h ../../core/error.h
init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.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

27
plugins/gallery/Makefile.dep
View File

@@ -1,12 +1,11 @@
# DO NOT DELETE
gallery.o: gallery.h ../../functions/functionbase.h ../../core/item.h
gallery.o: ../../../pikotools/confparser/space.h ../../db/db.h
gallery.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
gallery.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
gallery.o: ../../core/requesttypes.h ../../core/error.h
gallery.o: ../../../pikotools/confparser/confparser.h
gallery.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
gallery.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
gallery.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
gallery.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
gallery.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
gallery.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
gallery.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
gallery.o: ../../core/dircontainer.h ../../core/ugcontainer.h
gallery.o: ../../core/log.h ../../core/textstream.h
@@ -32,13 +31,13 @@ gallery.o: ../../core/users.h ../../core/groups.h ../../core/group.h
gallery.o: ../../core/loadavg.h ../../core/image.h ../../core/threadmanager.h
gallery.o: ../../core/synchro.h galleryinfo.h
galleryinfo.o: galleryinfo.h ../../core/item.h
galleryinfo.o: ../../../pikotools/confparser/space.h
galleryinfo.o: ../../../pikotools/space/space.h
init.o: gallery.h ../../functions/functionbase.h ../../core/item.h
init.o: ../../../pikotools/confparser/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
init.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
init.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
init.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -89,12 +88,12 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
init.o: ../../core/sessionmanager.h
templates.o: gallery.h ../../functions/functionbase.h ../../core/item.h
templates.o: ../../../pikotools/confparser/space.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
templates.o: ../../core/requesttypes.h ../../core/error.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h

22
plugins/group/Makefile.dep
View File

@@ -1,8 +1,8 @@
# DO NOT DELETE
groupinfo.o: groupinfo.h groups.h ../../../pikotools/confparser/confparser.h
groupinfo.o: ../../../pikotools/confparser/space.h ../../core/item.h
groupinfo.o: ../../../pikotools/confparser/space.h ../../core/system.h
groupinfo.o: groupinfo.h groups.h ../../../pikotools/space/spaceparser.h
groupinfo.o: ../../../pikotools/space/space.h ../../core/item.h
groupinfo.o: ../../../pikotools/space/space.h ../../core/system.h
groupinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
groupinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
groupinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
@@ -30,16 +30,16 @@ groupinfo.o: ../../core/lastcontainer.h ../../core/mounts.h
groupinfo.o: ../../core/mountparser.h ../../core/crypt.h ../../core/run.h
groupinfo.o: ../../core/users.h ../../core/loadavg.h ../../core/image.h
groupinfo.o: ../../core/threadmanager.h ../../core/log.h
groups.o: groups.h ../../../pikotools/confparser/confparser.h
groups.o: ../../../pikotools/confparser/space.h ../../core/log.h
groups.o: groups.h ../../../pikotools/space/spaceparser.h
groups.o: ../../../pikotools/space/space.h ../../core/log.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/error.h
init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../../pikotools/confparser/space.h
init.o: ../../core/misc.h ../../../pikotools/space/space.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
init.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
@@ -91,7 +91,7 @@ templates.o: ../../core/item.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
templates.o: ../../core/item.h ../../../pikotools/confparser/space.h
templates.o: ../../core/item.h ../../../pikotools/space/space.h
templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
templates.o: ../../templates/locale.h ../../templates/changepatterns.h
templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
@@ -100,8 +100,8 @@ templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/error.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h

4
plugins/group/groupinfo.cpp
View File

@@ -54,7 +54,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
conf_parser.SetSpace(space);
conf_parser.UTF8(config->utf8);
if( conf_parser.ParseString(str) == PT::ConfParser::ok )
if( conf_parser.ParseString(str) == PT::SpaceParser::ok )
{
groups.Reindex();
}
@@ -65,7 +65,7 @@ bool GroupInfo::ParseGroups(const std::wstring & str, Groups & groups)
groups.Clear();
}
return conf_parser.status == PT::ConfParser::ok;
return conf_parser.status == PT::SpaceParser::ok;
}

4
plugins/group/groupinfo.h
View File

@@ -13,7 +13,7 @@
#include <string>
#include <vector>
#include "groups.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
#include "core/item.h"
#include "core/system.h"
#include "core/config.h"
@@ -67,7 +67,7 @@ private:
typedef std::map<long, GroupsWrapItem> GroupsWrap;
GroupsWrap groups_wrap;
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
std::vector<Item*> config_dir_tab;
Item config_file;

2
plugins/group/groups.h
View File

@@ -13,7 +13,7 @@
#include <map>
#include <vector>
#include <string>
#include "confparser/confparser.h"
#include "space/spaceparser.h"

18
plugins/menu/Makefile.dep
View File

@@ -1,12 +1,12 @@
# DO NOT DELETE
cache.o: cache.h ../../core/item.h ../../../pikotools/confparser/space.h
cache.o: cache.h ../../core/item.h ../../../pikotools/space/space.h
cache.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
cache.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
cache.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
cache.o: ../../core/requesttypes.h ../../core/error.h
cache.o: ../../../pikotools/confparser/confparser.h
cache.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
cache.o: ../../../pikotools/space/spaceparser.h
cache.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
cache.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
cache.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
cache.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -28,10 +28,10 @@ cache.o: ../../core/lastcontainer.h ../../core/misc.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/error.h
init.o: ../../core/config.h ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../core/config.h ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../../pikotools/confparser/space.h
init.o: ../../core/misc.h ../../../pikotools/space/space.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
init.o: ../../core/plugin.h ../../core/pluginmsg.h ../../core/log.h
@@ -85,7 +85,7 @@ templates.o: ../../core/item.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../../pikotools/utf8/utf8.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../templates/patterncacher.h
templates.o: ../../core/item.h ../../../pikotools/confparser/space.h
templates.o: ../../core/item.h ../../../pikotools/space/space.h
templates.o: ../../templates/indexpatterns.h ../../templates/patterns.h
templates.o: ../../templates/locale.h ../../templates/changepatterns.h
templates.o: ../../templates/htmltextstream.h ../../templates/localefilter.h
@@ -93,8 +93,8 @@ templates.o: ../../core/config.h ../../core/cur.h ../../core/system.h
templates.o: ../../core/sessionmanager.h ../../core/htmlfilter.h
templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
templates.o: ../../db/dbtextstream.h ../../core/textstream.h
templates.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
templates.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h

24
plugins/stats/Makefile.dep
View File

@@ -2,12 +2,12 @@
bot.o: bot.h
init.o: ../../core/log.h ../../core/textstream.h ../../core/misc.h
init.o: ../../core/item.h ../../../pikotools/confparser/space.h
init.o: ../../core/item.h ../../../pikotools/space/space.h
init.o: ../../core/requesttypes.h ../../core/logmanipulators.h
init.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
init.o: ../../core/error.h ../../core/config.h
init.o: ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
init.o: ../../templates/htmltextstream.h ../../core/textstream.h
init.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
init.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
@@ -57,22 +57,22 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
init.o: ../../core/sessionmanager.h statssession.h ../../core/plugindata.h
stats.o: stats.h ../../core/config.h ../../core/log.h ../../core/textstream.h
stats.o: ../../core/misc.h ../../core/item.h
stats.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
stats.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
stats.o: ../../core/request.h ../../core/error.h ../../core/config.h
stats.o: ../../../pikotools/confparser/confparser.h
stats.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
stats.o: ../../core/misc.h ../../core/item.h ../../../pikotools/space/space.h
stats.o: ../../core/requesttypes.h ../../core/logmanipulators.h
stats.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
stats.o: ../../core/error.h ../../core/config.h
stats.o: ../../../pikotools/space/spaceparser.h
stats.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
stats.o: ../../templates/htmltextstream.h ../../core/textstream.h
stats.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
stats.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
stats.o: ../../../pikotools/utf8/utf8.h
templates.o: templates.h ../../core/plugin.h ../../core/pluginmsg.h
templates.o: ../../core/log.h ../../core/plugindata.h ../../core/config.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
templates.o: ../../core/request.h ../../core/requesttypes.h ../../core/item.h
templates.o: ../../../pikotools/confparser/space.h ../../core/error.h
templates.o: ../../../pikotools/space/space.h ../../core/error.h
templates.o: ../../core/textstream.h ../../core/misc.h
templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h

73
plugins/thread/Makefile.dep
View File

@@ -1,12 +1,12 @@
# DO NOT DELETE
createthread.o: createthread.h ../../functions/functionbase.h
createthread.o: ../../core/item.h ../../../pikotools/confparser/space.h
createthread.o: ../../core/item.h ../../../pikotools/space/space.h
createthread.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
createthread.o: ../../db/dbtextstream.h ../../core/textstream.h
createthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
createthread.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
createthread.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
createthread.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
createthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
createthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
createthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h
createthread.o: ../../core/log.h ../../core/textstream.h
@@ -58,11 +58,11 @@ createthread.o: ../../functions/uptime.h ../../functions/who.h
createthread.o: ../../functions/vim.h ../../core/htmlfilter.h
funthread.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
funthread.o: funthread.h ../../functions/functionbase.h ../../core/item.h
funthread.o: ../../../pikotools/confparser/space.h ../../db/db.h
funthread.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
funthread.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
funthread.o: ../../db/dbconn.h ../../db/dbtextstream.h
funthread.o: ../../core/textstream.h ../../core/misc.h ../../core/error.h
funthread.o: ../../../pikotools/confparser/confparser.h
funthread.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
funthread.o: ../../../pikotools/space/spaceparser.h
funthread.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
funthread.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
funthread.o: ../../core/dircontainer.h ../../core/ugcontainer.h
funthread.o: ../../core/log.h ../../core/textstream.h
@@ -90,11 +90,11 @@ funthread.o: ../../core/threadmanager.h ../../core/synchro.h tdb.h thread.h
funthread.o: ../../db/dbbase.h threadinfo.h
init.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h reply.h
init.o: ../../functions/functionbase.h ../../core/item.h
init.o: ../../../pikotools/confparser/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
init.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
init.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
init.o: ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
init.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
init.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
init.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -145,12 +145,11 @@ init.o: ../../templates/indexpatterns.h ../../templates/patterns.h
init.o: ../../templates/changepatterns.h ../../templates/htmltextstream.h
init.o: ../../core/sessionmanager.h templates.h
reply.o: reply.h ../../functions/functionbase.h ../../core/item.h
reply.o: ../../../pikotools/confparser/space.h ../../db/db.h
reply.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
reply.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
reply.o: ../../core/requesttypes.h ../../core/error.h
reply.o: ../../../pikotools/confparser/confparser.h
reply.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
reply.o: ../../../pikotools/space/space.h ../../db/db.h ../../db/dbbase.h
reply.o: ../../db/dbconn.h ../../db/dbtextstream.h ../../core/textstream.h
reply.o: ../../core/misc.h ../../core/item.h ../../core/requesttypes.h
reply.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
reply.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
reply.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
reply.o: ../../core/dircontainer.h ../../core/ugcontainer.h ../../core/log.h
reply.o: ../../core/textstream.h ../../core/logmanipulators.h
@@ -201,12 +200,12 @@ reply.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
reply.o: ../../templates/patterns.h ../../templates/changepatterns.h
reply.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
showthreads.o: showthreads.h ../../functions/functionbase.h ../../core/item.h
showthreads.o: ../../../pikotools/confparser/space.h ../../db/db.h
showthreads.o: ../../../pikotools/space/space.h ../../db/db.h
showthreads.o: ../../db/dbbase.h ../../db/dbconn.h ../../db/dbtextstream.h
showthreads.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
showthreads.o: ../../core/requesttypes.h ../../core/error.h
showthreads.o: ../../../pikotools/confparser/confparser.h
showthreads.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
showthreads.o: ../../../pikotools/space/spaceparser.h
showthreads.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
showthreads.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
showthreads.o: ../../core/dircontainer.h ../../core/ugcontainer.h
showthreads.o: ../../core/log.h ../../core/textstream.h
@@ -235,15 +234,15 @@ showthreads.o: ../../core/image.h ../../core/threadmanager.h
showthreads.o: ../../core/synchro.h tdb.h thread.h ../../db/dbbase.h
showthreads.o: threadinfo.h
tdb.o: tdb.h thread.h ../../db/dbbase.h ../../core/error.h ../../core/log.h
templates.o: threadinfo.h ../../core/item.h
templates.o: ../../../pikotools/confparser/space.h ../../core/system.h
templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
templates.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
templates.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
templates.o: ../../db/dbtextstream.h ../../core/textstream.h
templates.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
templates.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
templates.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
templates.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
templates.o: ../../db/dbconn.h ../../db/dbtextstream.h
templates.o: ../../core/textstream.h ../../core/misc.h
templates.o: ../../core/requesttypes.h ../../core/error.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h
@@ -295,15 +294,15 @@ templates.o: ../../core/htmlfilter.h ../../templates/templates.h
templates.o: ../../templates/patterncacher.h ../../templates/indexpatterns.h
templates.o: ../../templates/patterns.h ../../templates/changepatterns.h
templates.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
threadinfo.o: threadinfo.h ../../core/item.h
threadinfo.o: ../../../pikotools/confparser/space.h ../../core/system.h
threadinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
threadinfo.o: ../../core/dirs.h ../../core/item.h ../../core/dircontainer.h
threadinfo.o: ../../db/db.h ../../db/dbbase.h ../../db/dbconn.h
threadinfo.o: ../../db/dbtextstream.h ../../core/textstream.h
threadinfo.o: ../../core/misc.h ../../core/requesttypes.h ../../core/error.h
threadinfo.o: ../../../pikotools/confparser/confparser.h
threadinfo.o: ../../../pikotools/confparser/space.h ../../db/dbitemquery.h
threadinfo.o: threadinfo.h ../../core/item.h ../../../pikotools/space/space.h
threadinfo.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
threadinfo.o: ../../core/synchro.h ../../core/dirs.h ../../core/item.h
threadinfo.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
threadinfo.o: ../../db/dbconn.h ../../db/dbtextstream.h
threadinfo.o: ../../core/textstream.h ../../core/misc.h
threadinfo.o: ../../core/requesttypes.h ../../core/error.h
threadinfo.o: ../../../pikotools/space/spaceparser.h
threadinfo.o: ../../../pikotools/space/space.h ../../db/dbitemquery.h
threadinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
threadinfo.o: ../../core/dircontainer.h ../../core/ugcontainer.h
threadinfo.o: ../../core/log.h ../../core/textstream.h

102
plugins/ticket/Makefile.dep
View File

@@ -3,10 +3,9 @@
createticket.o: createticket.h tdb.h ticket.h ../../db/dbbase.h
createticket.o: ../../db/dbconn.h ../../db/dbtextstream.h
createticket.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
createticket.o: ../../../pikotools/confparser/space.h
createticket.o: ../../core/requesttypes.h ../../core/error.h
createticket.o: ../../../pikotools/confparser/confparser.h
createticket.o: ../../../pikotools/confparser/space.h
createticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
createticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
createticket.o: ../../../pikotools/space/space.h
createticket.o: ../../functions/functionbase.h ../../core/item.h
createticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
createticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -61,11 +60,11 @@ createticket.o: ../../core/plugindata.h ../../functions/rm.h
editticket.o: editticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
editticket.o: ../../db/dbtextstream.h ../../core/textstream.h
editticket.o: ../../core/misc.h ../../core/item.h
editticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
editticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
editticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
editticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
editticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
editticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
editticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
editticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
editticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
editticket.o: ../../core/synchro.h ../../core/dirs.h
editticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
editticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
editticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
@@ -117,21 +116,20 @@ editticket.o: ../../functions/rm.h
funticket.o: funticket.h tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
funticket.o: ../../db/dbtextstream.h ../../core/textstream.h
funticket.o: ../../core/misc.h ../../core/item.h
funticket.o: ../../../pikotools/confparser/space.h ../../core/requesttypes.h
funticket.o: ../../core/error.h ../../../pikotools/confparser/confparser.h
funticket.o: ../../../pikotools/confparser/space.h ticketinfo.h
funticket.o: ../../core/item.h ../../core/system.h ../../core/job.h
funticket.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
funticket.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
funticket.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
funticket.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
funticket.o: ../../core/ugcontainer.h ../../core/log.h
funticket.o: ../../core/textstream.h ../../core/logmanipulators.h
funticket.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
funticket.o: ../../core/error.h ../../core/config.h ../../core/htmlfilter.h
funticket.o: ../../templates/htmltextstream.h ../../core/session.h
funticket.o: ../../core/user.h ../../core/plugindata.h ../../core/rebus.h
funticket.o: ../../core/mount.h ../../templates/locale.h
funticket.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
funticket.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
funticket.o: ../../../pikotools/space/space.h ticketinfo.h ../../core/item.h
funticket.o: ../../core/system.h ../../core/job.h ../../core/basethread.h
funticket.o: ../../core/synchro.h ../../core/dirs.h ../../core/dircontainer.h
funticket.o: ../../db/db.h ../../db/dbbase.h ../../db/dbitemquery.h
funticket.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
funticket.o: ../../core/dircontainer.h ../../core/ugcontainer.h
funticket.o: ../../core/log.h ../../core/textstream.h
funticket.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
funticket.o: ../../core/request.h ../../core/error.h ../../core/config.h
funticket.o: ../../core/htmlfilter.h ../../templates/htmltextstream.h
funticket.o: ../../core/session.h ../../core/user.h ../../core/plugindata.h
funticket.o: ../../core/rebus.h ../../core/mount.h ../../templates/locale.h
funticket.o: ../../notify/notify.h ../../notify/notifypool.h
funticket.o: ../../templates/patterns.h ../../templates/locale.h
funticket.o: ../../templates/localefilter.h ../../../ezc/src/ezc.h
@@ -177,10 +175,10 @@ funticket.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
funticket.o: ../../plugins/thread/pluginmsg.h
init.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
init.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
init.o: ../../core/item.h ../../../pikotools/confparser/space.h
init.o: ../../core/item.h ../../../pikotools/space/space.h
init.o: ../../core/requesttypes.h ../../core/error.h
init.o: ../../../pikotools/confparser/confparser.h
init.o: ../../../pikotools/confparser/space.h funticket.h ticketinfo.h
init.o: ../../../pikotools/space/spaceparser.h
init.o: ../../../pikotools/space/space.h funticket.h ticketinfo.h
init.o: ../../core/item.h ../../core/system.h ../../core/job.h
init.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
init.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -235,14 +233,13 @@ init.o: sessiondata.h ../../core/plugindata.h ../../functions/rm.h
init.o: ../../plugins/thread/showthreads.h ../../plugins/thread/threadinfo.h
init.o: ../../plugins/thread/thread.h ../../plugins/thread/pluginmsg.h
sessiondata.o: sessiondata.h ../../core/plugindata.h ticket.h
sessiondata.o: ../../functions/rm.h ../../../pikotools/confparser/space.h
sessiondata.o: ../../functions/rm.h ../../../pikotools/space/space.h
showtickets.o: showtickets.h tdb.h ticket.h ../../db/dbbase.h
showtickets.o: ../../db/dbconn.h ../../db/dbtextstream.h
showtickets.o: ../../core/textstream.h ../../core/misc.h ../../core/item.h
showtickets.o: ../../../pikotools/confparser/space.h
showtickets.o: ../../core/requesttypes.h ../../core/error.h
showtickets.o: ../../../pikotools/confparser/confparser.h
showtickets.o: ../../../pikotools/confparser/space.h ticketinfo.h
showtickets.o: ../../../pikotools/space/space.h ../../core/requesttypes.h
showtickets.o: ../../core/error.h ../../../pikotools/space/spaceparser.h
showtickets.o: ../../../pikotools/space/space.h ticketinfo.h
showtickets.o: ../../core/item.h ../../core/system.h ../../core/job.h
showtickets.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
showtickets.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
@@ -302,27 +299,26 @@ showtickets.o: ../../templates/changepatterns.h
showtickets.o: ../../templates/htmltextstream.h ../../core/sessionmanager.h
tdb.o: tdb.h ticket.h ../../db/dbbase.h ../../db/dbconn.h
tdb.o: ../../db/dbtextstream.h ../../core/textstream.h ../../core/misc.h
tdb.o: ../../core/item.h ../../../pikotools/confparser/space.h
tdb.o: ../../core/item.h ../../../pikotools/space/space.h
tdb.o: ../../core/requesttypes.h ../../core/error.h
tdb.o: ../../../pikotools/confparser/confparser.h
tdb.o: ../../../pikotools/confparser/space.h ../../core/log.h
tdb.o: ../../../pikotools/space/spaceparser.h
tdb.o: ../../../pikotools/space/space.h ../../core/log.h
templates.o: ../../../ezc/src/ezc.h ../../../ezc/src/generator.h
templates.o: ../../../ezc/src/pattern.h ../../core/item.h
templates.o: ../../../pikotools/confparser/space.h
templates.o: ../../../ezc/src/functions.h ../../../ezc/src/funinfo.h
templates.o: ../../../ezc/src/stringconv.h ../../../pikotools/utf8/utf8.h
templates.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
templates.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
templates.o: ../../core/dirs.h ../../core/dircontainer.h ../../db/db.h
templates.o: ../../db/dbbase.h ../../db/dbitemquery.h
templates.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
templates.o: ../../core/dircontainer.h ../../core/ugcontainer.h
templates.o: ../../core/log.h ../../core/textstream.h
templates.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
templates.o: ../../core/request.h ../../core/requesttypes.h
templates.o: ../../core/error.h ../../core/config.h
templates.o: ../../../pikotools/confparser/confparser.h
templates.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
templates.o: ../../../pikotools/space/space.h ../../../ezc/src/functions.h
templates.o: ../../../ezc/src/funinfo.h ../../../ezc/src/stringconv.h
templates.o: ../../../pikotools/utf8/utf8.h ticketinfo.h ticket.h
templates.o: ../../core/item.h ../../core/system.h ../../core/job.h
templates.o: ../../core/basethread.h ../../core/synchro.h ../../core/dirs.h
templates.o: ../../core/dircontainer.h ../../db/db.h ../../db/dbbase.h
templates.o: ../../db/dbitemquery.h ../../db/dbitemcolumns.h
templates.o: ../../core/user.h ../../core/group.h ../../core/dircontainer.h
templates.o: ../../core/ugcontainer.h ../../core/log.h
templates.o: ../../core/textstream.h ../../core/logmanipulators.h
templates.o: ../../core/slog.h ../../core/cur.h ../../core/request.h
templates.o: ../../core/requesttypes.h ../../core/error.h ../../core/config.h
templates.o: ../../../pikotools/space/spaceparser.h
templates.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
templates.o: ../../templates/htmltextstream.h ../../core/textstream.h
templates.o: ../../core/misc.h ../../core/session.h ../../core/user.h
templates.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h
@@ -372,7 +368,7 @@ templates.o: ../../plugins/thread/pluginmsg.h ../../templates/miscspace.h
templates.o: ../../templates/templates.h
ticketinfo.o: ticketinfo.h ticket.h ../../core/item.h ../../core/system.h
ticketinfo.o: ../../core/job.h ../../core/basethread.h ../../core/synchro.h
ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/dirs.h
ticketinfo.o: ../../../pikotools/space/space.h ../../core/dirs.h
ticketinfo.o: ../../core/item.h ../../core/dircontainer.h ../../db/db.h
ticketinfo.o: ../../db/dbbase.h ../../db/dbitemquery.h
ticketinfo.o: ../../db/dbitemcolumns.h ../../core/user.h ../../core/group.h
@@ -381,8 +377,8 @@ ticketinfo.o: ../../core/log.h ../../core/textstream.h
ticketinfo.o: ../../core/logmanipulators.h ../../core/slog.h ../../core/cur.h
ticketinfo.o: ../../core/request.h ../../core/requesttypes.h
ticketinfo.o: ../../core/error.h ../../core/config.h
ticketinfo.o: ../../../pikotools/confparser/confparser.h
ticketinfo.o: ../../../pikotools/confparser/space.h ../../core/htmlfilter.h
ticketinfo.o: ../../../pikotools/space/spaceparser.h
ticketinfo.o: ../../../pikotools/space/space.h ../../core/htmlfilter.h
ticketinfo.o: ../../templates/htmltextstream.h ../../core/textstream.h
ticketinfo.o: ../../core/misc.h ../../core/session.h ../../core/user.h
ticketinfo.o: ../../core/plugindata.h ../../core/rebus.h ../../core/mount.h

2
plugins/ticket/sessiondata.h
View File

@@ -16,7 +16,7 @@
#include "core/plugindata.h"
#include "ticket.h"
#include "functions/rm.h"
#include "confparser/space.h"
#include "space/space.h"
namespace Ticket

2
plugins/ticket/templates.cpp
View File

@@ -19,7 +19,7 @@
#include "sessiondata.h"
#include "plugins/thread/pluginmsg.h"
#include "templates/miscspace.h"
#include "confparser/space.h"
#include "space/space.h"
namespace Ticket

2
plugins/ticket/ticketinfo.cpp
View File

@@ -138,7 +138,7 @@ bool TicketInfo::ParseTicketConf(long mount_dir_id, const std::wstring & path)
conf_parser.SplitSingle(true);
conf_tab[mount_dir_id].conf.Clear();
return (conf_parser.ParseString(config_file.content) == PT::ConfParser::ok);
return (conf_parser.ParseString(config_file.content) == PT::SpaceParser::ok);
}

4
plugins/ticket/ticketinfo.h
View File

@@ -18,7 +18,7 @@
#include "functions/functions.h"
#include "db/db.h"
#include "tdb.h"
#include "confparser/confparser.h"
#include "space/spaceparser.h"
@@ -119,7 +119,7 @@ private:
std::wstring file_path;
// for reading config file
PT::ConfParser conf_parser;
PT::SpaceParser conf_parser;
std::vector<Item*> config_dir_tab;
Item config_file;