now winix is using 'pikotools' (confparser, utf8, mainparser)
git-svn-id: svn://ttmath.org/publicrep/winix/trunk@792 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -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.
|
||||
*
|
||||
*/
|
||||
@@ -17,7 +17,7 @@ namespace GroupItem
|
||||
|
||||
|
||||
|
||||
Space * Groups::GetSpace()
|
||||
PT::Space * Groups::GetSpace()
|
||||
{
|
||||
return &space;
|
||||
}
|
||||
@@ -50,20 +50,20 @@ void Groups::Reindex()
|
||||
}
|
||||
|
||||
|
||||
void Groups::ReindexGroups(GroupIndex & group_index, Space & set)
|
||||
void Groups::ReindexGroups(GroupIndex & group_index, PT::Space & set)
|
||||
{
|
||||
size_t i, v;
|
||||
|
||||
// loop through all groups in the set
|
||||
for( i=0 ; i < set.spaces.size() ; ++i )
|
||||
{
|
||||
Space & group = *set.spaces[i];
|
||||
PT::Space & group = *set.spaces[i];
|
||||
const std::wstring & key = group.Text(L"key", L"value");
|
||||
|
||||
// loop through all values in the group
|
||||
for(v=0 ; v<group.spaces.size() ; )
|
||||
{
|
||||
Space::Table::iterator vali = group.spaces[v]->table.find(key);
|
||||
PT::Space::Table::iterator vali = group.spaces[v]->table.find(key);
|
||||
|
||||
if( vali != group.spaces[v]->table.end() && vali->second.size() == 1 )
|
||||
{
|
||||
@@ -93,7 +93,7 @@ size_t i, v;
|
||||
}
|
||||
|
||||
|
||||
void Groups::SortValues(Space & group)
|
||||
void Groups::SortValues(PT::Space & group)
|
||||
{
|
||||
sort_by = group.Text(L"sort_by");
|
||||
sort_asc = (group.Text(L"sort_asc", L"true") == L"true");
|
||||
@@ -106,7 +106,7 @@ void Groups::SortValues(Space & group)
|
||||
}
|
||||
|
||||
|
||||
bool Groups::SortFunHelper::operator()(Space * sp1, Space * sp2)
|
||||
bool Groups::SortFunHelper::operator()(PT::Space * sp1, PT::Space * sp2)
|
||||
{
|
||||
const std::wstring & val1 = sp1->Text(groups->sort_by, L"");
|
||||
const std::wstring & val2 = sp2->Text(groups->sort_by, L"");
|
||||
@@ -157,11 +157,11 @@ const std::wstring & Groups::GetOption(size_t seti, size_t groupi, size_t valuei
|
||||
{
|
||||
if( seti < space.spaces.size() )
|
||||
{
|
||||
Space & groups = *space.spaces[seti];
|
||||
PT::Space & groups = *space.spaces[seti];
|
||||
|
||||
if( groupi < groups.spaces.size() )
|
||||
{
|
||||
Space & value = *groups.spaces[groupi];
|
||||
PT::Space & value = *groups.spaces[groupi];
|
||||
|
||||
if( valuei < value.spaces.size() )
|
||||
return value.spaces[valuei]->Text(option);
|
||||
@@ -183,7 +183,7 @@ size_t Groups::Size(size_t seti, size_t groupi)
|
||||
{
|
||||
if( seti < space.spaces.size() )
|
||||
{
|
||||
Space & groups = *space.spaces[seti];
|
||||
PT::Space & groups = *space.spaces[seti];
|
||||
|
||||
if( groupi < groups.spaces.size() )
|
||||
return groups.spaces[groupi]->spaces.size();
|
||||
|
Reference in New Issue
Block a user