mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-08-21 22:04:56 -06:00
uppsrc: Fixed two POSIX -> PLATFORM_POSX ifdefs (#499), CtrlLib: Renamed DropList Add to Append
git-svn-id: svn://ultimatepp.org/upp/trunk@6237 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl
parent
5b5a720a6a
commit
d54af3d257
5 changed files with 34 additions and 35 deletions
|
|
@ -1013,7 +1013,7 @@ bool RealizeDirectory(const String& d)
|
|||
dir = GetFileFolder(dir);
|
||||
}
|
||||
for(int i = p.GetCount() - 1; i >= 0; i--)
|
||||
#ifdef POSIX
|
||||
#ifdef PLATFORM_POSIX
|
||||
if(!DirectoryCreate(p[i], mode))
|
||||
#else
|
||||
if(!DirectoryCreate(p[i]))
|
||||
|
|
|
|||
|
|
@ -134,11 +134,11 @@ public:
|
|||
virtual ~DropList();
|
||||
};
|
||||
|
||||
void Add(DropList& list, const VectorMap<Value, Value>& values);
|
||||
void Add(DropList& list, const VectorMap<int, String>& values);
|
||||
void Add(MapConvert& convert, const VectorMap<Value, Value>& values);
|
||||
void Add(MapConvert& convert, const VectorMap<int, String>& values);
|
||||
void Add(DropList& list, const MapConvert& convert);
|
||||
void Append(DropList& list, const VectorMap<Value, Value>& values);
|
||||
void Append(DropList& list, const VectorMap<int, String>& values);
|
||||
void Append(MapConvert& convert, const VectorMap<Value, Value>& values);
|
||||
void Append(MapConvert& convert, const VectorMap<int, String>& values);
|
||||
void Append(DropList& list, const MapConvert& convert);
|
||||
|
||||
void operator*=(DropList& list, const VectorMap<Value, Value>& values);
|
||||
void operator*=(DropList& list, const VectorMap<int, String>& values);
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -312,28 +312,28 @@ list.&]
|
|||
[s9;%% These are simple utility function for filling DropList`'s
|
||||
list and MapConvert.&]
|
||||
[s3;%% &]
|
||||
[s0;%% &]
|
||||
[s5;:Add`(DropList`&`,const VectorMap`<Value`,Value`>`&`): [@(0.0.255) void]_[* Add]([_^DropList^ D
|
||||
ropList][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^VectorMap^ VectorMap][@(0.0.255) <
|
||||
][_^Value^ Value], [_^Value^ Value][@(0.0.255) >`&]_[*@3 values])&]
|
||||
[s5;:Add`(DropList`&`,const VectorMap`<int`,String`>`&`): [@(0.0.255) void]_[* Add]([_^DropList^ D
|
||||
ropList][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^VectorMap^ VectorMap]<[@(0.0.255) i
|
||||
nt], [_^String^ String]>`&_[*@3 values])&]
|
||||
[s3;%% &]
|
||||
[s5;:Append`(DropList`&`,const VectorMap`<Value`,Value`>`&`): [@(0.0.255) void]_[* Append
|
||||
]([_^DropList^ DropList][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^VectorMap^ Vector
|
||||
Map]<[_^Value^ Value], [_^Value^ Value]>`&_[*@3 values])&]
|
||||
[s5;:Append`(DropList`&`,const VectorMap`<int`,String`>`&`): [@(0.0.255) void]_[* Append](
|
||||
[_^DropList^ DropList][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^VectorMap^ VectorMa
|
||||
p]<[@(0.0.255) int], [_^String^ String]>`&_[*@3 values])&]
|
||||
[s2;%% Fills the DropList from VectorMap.&]
|
||||
[s3; &]
|
||||
[s3;%% &]
|
||||
[s4; &]
|
||||
[s5;:Add`(MapConvert`&`,const VectorMap`<Value`,Value`>`&`): [@(0.0.255) void]_[* Add]([_^MapConvert^ M
|
||||
apConvert][@(0.0.255) `&]_[*@3 convert], [@(0.0.255) const]_[_^VectorMap^ VectorMap][@(0.0.255) <
|
||||
][_^Value^ Value], [_^Value^ Value][@(0.0.255) >`&]_[*@3 values])&]
|
||||
[s5;:Add`(MapConvert`&`,const VectorMap`<int`,String`>`&`): [@(0.0.255) void]_[* Add]([_^MapConvert^ M
|
||||
apConvert][@(0.0.255) `&]_[*@3 convert], [@(0.0.255) const]_[_^VectorMap^ VectorMap]<[@(0.0.255) i
|
||||
nt], [_^String^ String]>`&_[*@3 values])&]
|
||||
[s5;:Append`(MapConvert`&`,const VectorMap`<Value`,Value`>`&`): [@(0.0.255) void]_[* Appe
|
||||
nd]([_^MapConvert^ MapConvert][@(0.0.255) `&]_[*@3 convert], [@(0.0.255) const]_[_^VectorMap^ V
|
||||
ectorMap]<[_^Value^ Value], [_^Value^ Value]>`&_[*@3 values])&]
|
||||
[s5;:Append`(MapConvert`&`,const VectorMap`<int`,String`>`&`): [@(0.0.255) void]_[* Appen
|
||||
d]([_^MapConvert^ MapConvert][@(0.0.255) `&]_[*@3 convert], [@(0.0.255) const]_[_^VectorMap^ V
|
||||
ectorMap]<[@(0.0.255) int], [_^String^ String]>`&_[*@3 values])&]
|
||||
[s2;%% Fills the MapConvert from VectorMap.&]
|
||||
[s3;%% &]
|
||||
[s4; &]
|
||||
[s5;:Add`(DropList`&`,const MapConvert`&`): [@(0.0.255) void]_[* Add]([_^DropList^ DropList
|
||||
][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^MapConvert^ MapConvert][@(0.0.255) `&]_[*@3 c
|
||||
onvert])&]
|
||||
[s5;:Append`(DropList`&`,const MapConvert`&`): [@(0.0.255) void]_[* Append]([_^DropList^ Dr
|
||||
opList][@(0.0.255) `&]_[*@3 list], [@(0.0.255) const]_[_^MapConvert^ MapConvert][@(0.0.255) `&
|
||||
]_[*@3 convert])&]
|
||||
[s2;%% Fills the DropList from MapConvert.&]
|
||||
[s3;%% &]
|
||||
[s4; &]
|
||||
|
|
|
|||
|
|
@ -252,7 +252,7 @@ void SkylarkApp::Run()
|
|||
#endif
|
||||
Main();
|
||||
|
||||
#if defined(_DEBUG) && defined(POSIX)
|
||||
#if defined(_DEBUG) && defined(PLATFORM_POSIX)
|
||||
FileDelete(pidf);
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue