github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-29 22:03:40 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppsrc: Fixed two POSIX -> PLATFORM_POSX ifdefs (#499), CtrlLib: Renamed DropList Add to Append

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6237 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-08-08 08:01:57 +00:00
parent 5b5a720a6a
commit d54af3d257
5 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

21
uppsrc/CtrlLib/DropList.cpp
View file

@ -265,31 +265,31 @@ DropList::DropList()
DropList::~DropList() {}
void Add(DropList& list, const VectorMap<Value, Value>& values)
void Append(DropList& list, const VectorMap<Value, Value>& values)
{
for(int i = 0; i < values.GetCount(); i++)
list.Add(values.GetKey(i), values[i]);
}
void Add(MapConvert& convert, const VectorMap<Value, Value>& values)
void Append(MapConvert& convert, const VectorMap<Value, Value>& values)
{
for(int i = 0; i < values.GetCount(); i++)
convert.Add(values.GetKey(i), values[i]);
}
void Add(DropList& list, const VectorMap<int, String>& values)
void Append(DropList& list, const VectorMap<int, String>& values)
{
for(int i = 0; i < values.GetCount(); i++)
list.Add(values.GetKey(i), values[i]);
}
void Add(MapConvert& convert, const VectorMap<int, String>& values)
void Append(MapConvert& convert, const VectorMap<int, String>& values)
{
for(int i = 0; i < values.GetCount(); i++)
convert.Add(values.GetKey(i), values[i]);
}
void Add(DropList& list, const MapConvert& convert)
void Append(DropList& list, const MapConvert& convert)
{
for(int i = 0; i < convert.GetCount(); i++)
list.Add(convert.GetKey(i), convert.GetValue(i));
@ -298,32 +298,31 @@ void Add(DropList& list, const MapConvert& convert)
void operator*=(DropList& list, const VectorMap<Value, Value>& values)
{
list.ClearList();
Add(list, values);
Append(list, values);
}
void operator*=(MapConvert& convert, const VectorMap<Value, Value>& values)
{
convert.Clear();
Add(convert, values);
Append(convert, values);
}
void operator*=(DropList& list, const VectorMap<int, String>& values)
{
list.ClearList();
Add(list, values);
Append(list, values);
}
void operator*=(MapConvert& convert, const VectorMap<int, String>& values)
{
convert.Clear();
Add(convert, values);
Append(convert, values);
}
void operator*=(DropList& list, const MapConvert& convert)
{
list.ClearList();
Add(list, convert);
Append(list, convert);
}
END_UPP_NAMESPACE