From d54af3d257aa472cbb669b7ecbc2124f73352962 Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 8 Aug 2013 08:01:57 +0000 Subject: [PATCH] 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 --- uppsrc/Core/Path.cpp | 2 +- uppsrc/CtrlLib/DropChoice.h | 10 +++---- uppsrc/CtrlLib/DropList.cpp | 21 +++++++------- uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp | 34 +++++++++++------------ uppsrc/Skylark/App.cpp | 2 +- 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/uppsrc/Core/Path.cpp b/uppsrc/Core/Path.cpp index c3917a76c..d04bd4fc5 100644 --- a/uppsrc/Core/Path.cpp +++ b/uppsrc/Core/Path.cpp @@ -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])) diff --git a/uppsrc/CtrlLib/DropChoice.h b/uppsrc/CtrlLib/DropChoice.h index db5803210..4a30e8a4d 100644 --- a/uppsrc/CtrlLib/DropChoice.h +++ b/uppsrc/CtrlLib/DropChoice.h @@ -134,11 +134,11 @@ public: virtual ~DropList(); }; -void Add(DropList& list, const VectorMap& values); -void Add(DropList& list, const VectorMap& values); -void Add(MapConvert& convert, const VectorMap& values); -void Add(MapConvert& convert, const VectorMap& values); -void Add(DropList& list, const MapConvert& convert); +void Append(DropList& list, const VectorMap& values); +void Append(DropList& list, const VectorMap& values); +void Append(MapConvert& convert, const VectorMap& values); +void Append(MapConvert& convert, const VectorMap& values); +void Append(DropList& list, const MapConvert& convert); void operator*=(DropList& list, const VectorMap& values); void operator*=(DropList& list, const VectorMap& values); diff --git a/uppsrc/CtrlLib/DropList.cpp b/uppsrc/CtrlLib/DropList.cpp index 5293c6056..4f7386c09 100644 --- a/uppsrc/CtrlLib/DropList.cpp +++ b/uppsrc/CtrlLib/DropList.cpp @@ -265,31 +265,31 @@ DropList::DropList() DropList::~DropList() {} -void Add(DropList& list, const VectorMap& values) +void Append(DropList& list, const VectorMap& values) { for(int i = 0; i < values.GetCount(); i++) list.Add(values.GetKey(i), values[i]); } -void Add(MapConvert& convert, const VectorMap& values) +void Append(MapConvert& convert, const VectorMap& values) { for(int i = 0; i < values.GetCount(); i++) convert.Add(values.GetKey(i), values[i]); } -void Add(DropList& list, const VectorMap& values) +void Append(DropList& list, const VectorMap& values) { for(int i = 0; i < values.GetCount(); i++) list.Add(values.GetKey(i), values[i]); } -void Add(MapConvert& convert, const VectorMap& values) +void Append(MapConvert& convert, const VectorMap& 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& values) { list.ClearList(); - Add(list, values); + Append(list, values); } void operator*=(MapConvert& convert, const VectorMap& values) { convert.Clear(); - Add(convert, values); + Append(convert, values); } void operator*=(DropList& list, const VectorMap& values) { list.ClearList(); - Add(list, values); + Append(list, values); } void operator*=(MapConvert& convert, const VectorMap& 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 diff --git a/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp b/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp index 2b7874913..64ec2b1a0 100644 --- a/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp +++ b/uppsrc/CtrlLib/src.tpp/DropList$en-us.tpp @@ -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``&`): [@(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``&`): [@(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``&`): [@(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``&`): [@(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``&`): [@(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``&`): [@(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``&`): [@(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``&`): [@(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; &] diff --git a/uppsrc/Skylark/App.cpp b/uppsrc/Skylark/App.cpp index 0ea587a33..c9cb251f2 100644 --- a/uppsrc/Skylark/App.cpp +++ b/uppsrc/Skylark/App.cpp @@ -252,7 +252,7 @@ void SkylarkApp::Run() #endif Main(); -#if defined(_DEBUG) && defined(POSIX) +#if defined(_DEBUG) && defined(PLATFORM_POSIX) FileDelete(pidf); #endif