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

updated to the new Pikotools API

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@1071 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2018-01-06 18:12:53 +00:00
parent 3eff400d88
commit ccf78dcb02
48 changed files with 766 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
winixd/plugins/group/Makefile.dep
View File

@@ -23,6 +23,8 @@ groupinfo.o: ../../../../winix/winixd/core/requesttypes.h
groupinfo.o: ../../../../pikotools/textstream/textstream.h
groupinfo.o: ../../../../pikotools/convert/convert.h
groupinfo.o: ../../../../pikotools/convert/inttostr.h
groupinfo.o: ../../../../pikotools/convert/strtoint.h
groupinfo.o: ../../../../pikotools/convert/text.h
groupinfo.o: ../../../../pikotools/membuffer/membuffer.h
groupinfo.o: ../../../../pikotools/textstream/types.h
groupinfo.o: ../../../../pikotools/utf8/utf8.h
@@ -95,13 +97,18 @@ init.o: ../../../../pikotools/textstream/textstream.h
init.o: ../../../../pikotools/space/space.h ../../../../pikotools/date/date.h
init.o: ../../../../pikotools/convert/convert.h
init.o: ../../../../pikotools/convert/inttostr.h
init.o: ../../../../pikotools/convert/strtoint.h
init.o: ../../../../pikotools/convert/text.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/membuffer/membuffer.h
init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/slog.h
init.o: ../../../../winix/winixd/core/cur.h
init.o: ../../../../winix/winixd/core/request.h
init.o: ../../../../winix/winixd/core/requesttypes.h
init.o: ../../../../winix/winixd/core/item.h
init.o: ../../../../winix/winixd/core/error.h
init.o: ../../../../winix/winixd/core/config.h
init.o: ../../../../pikotools/space/spaceparser.h
@@ -110,9 +117,6 @@ init.o: ../../../../pikotools/textstream/types.h
init.o: ../../../../winix/winixd/core/htmlfilter.h
init.o: ../../../../winix/winixd/templates/htmltextstream.h
init.o: ../../../../winix/winixd/core/textstream.h
init.o: ../../../../winix/winixd/core/misc.h
init.o: ../../../../pikotools/utf8/utf8.h
init.o: ../../../../winix/winixd/core/winix_const.h
init.o: ../../../../pikotools/space/spacetojson.h
init.o: ../../../../ezc/src/outstreams.h
init.o: ../../../../winix/winixd/core/session.h
@@ -243,6 +247,8 @@ templates.o: ../../../../pikotools/space/space.h
templates.o: ../../../../pikotools/date/date.h
templates.o: ../../../../pikotools/convert/convert.h
templates.o: ../../../../pikotools/convert/inttostr.h
templates.o: ../../../../pikotools/convert/strtoint.h
templates.o: ../../../../pikotools/convert/text.h
templates.o: ../../../../pikotools/membuffer/membuffer.h
templates.o: ../../../../pikotools/textstream/types.h
templates.o: ../../../../winix/winixd/core/winix_const.h

2
winixd/plugins/group/Makefile.o.dep
View File

@@ -1 +1 @@
o = groupinfo.o groups.o init.o templates.o
o = groupinfo.o groups.o init.o templates.o

6
winixd/plugins/group/groups.cpp
View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2011-2014, Tomasz Sowa
* Copyright (c) 2011-2018, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -94,7 +94,7 @@ size_t i, v;
// loop through all values in the group
for(v=0 ; v<group.spaces.size() ; )
{
std::wstring * vali = group.spaces[v]->GetValue(key);
std::wstring * vali = group.spaces[v]->GetFirstValue(key);
if( vali )
{
@@ -199,7 +199,7 @@ const std::wstring & Groups::GetOption(size_t seti, size_t groupi, size_t valuei
PT::Space & value = *groups.spaces[groupi];
if( valuei < value.spaces.size() )
return value.spaces[valuei]->Text(option);
return value.spaces[valuei]->TextRef(option);
}
}