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

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"