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

CtrlLib: ArrayCtrl Add/Set(..ValueMap) renamed to AddMap/SetMap (to avoid ambiguity with Value)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6410 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-10-11 11:33:04 +00:00
parent 2da4535f7c
commit fa52c570bf
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/CtrlLib/ArrayCtrl.cpp
View file

@ -1901,7 +1901,7 @@ void ArrayCtrl::Set(int ii, const VectorMap<String, Value>& m)
}
}
void ArrayCtrl::Set(int ii, const ValueMap& m)
void ArrayCtrl::SetMap(int ii, const ValueMap& m)
{
for(int i = 0; i < m.GetCount(); i++) {
int j = GetPos((String)m.GetKey(i));
@ -1915,7 +1915,7 @@ void ArrayCtrl::Add(const VectorMap<String, Value>& m)
Set(array.GetCount(), m);
}
void ArrayCtrl::Add(const ValueMap& m)
void ArrayCtrl::AddMap(const ValueMap& m)
{
Set(array.GetCount(), m);
}

9
uppsrc/CtrlLib/ArrayCtrl.h
View file

@ -317,6 +317,10 @@ private:
using Ctrl::IsModified;
// These are listed here as private because name has changed to SetMap/AddMap
void Set(int i, const ValueMap& m);
void Add(const ValueMap& m);
public: // temporary (TRC 06/07/28) // will be removed!
Ctrl& SetCtrl(int i, int j, Ctrl *newctrl) { return SetCtrl(i, j, newctrl, true, true); }
@ -438,7 +442,6 @@ public:
void Set(int i, const Vector<Value>& v);
void Set(int i, const VectorMap<String, Value>& m);
void Set(int i, const ValueMap& m);
void Add();
@ -451,7 +454,9 @@ public:
void Add(const Vector<Value>& v);
void Add(const Nuller& null) { Add((Value)Null); }
void Add(const VectorMap<String, Value>& m);
void Add(const ValueMap& m);
void SetMap(int i, const ValueMap& m);
void AddMap(const ValueMap& m);
void SetArray(int i, const ValueArray& va);
void AddArray(const ValueArray& va);

6
uppsrc/ide/ide.key
View file

@ -9,8 +9,8 @@ KEY(EXIT, "Exit", K_CTRL_Q)
KEY(SPLIT, "Split editor vertical", K_CTRL_MINUS)
KEY(VSPLIT, "Split editor horizontal", K_CTRL_BACKSLASH)
KEY(SWAP, "Other editor", K_CTRL_GRAVE)
KEY(CLOSETAB, "Close file tab", K_CTRL_U)
KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_U)
KEY(CLOSETAB, "Close file tab", K_CTRL_W)
KEY(CLOSETABS, "Close all file tabs", K_SHIFT|K_CTRL_W)
KEY(PRINT, "Print..", K_CTRL_P)
KEY(FINDINFILES, "Find in Files..", K_CTRL_F|K_SHIFT)
@ -108,4 +108,4 @@ KEY(TOCSTRING, "Convert to C string", 0)
KEY(DIFF, "Compare with file..", 0)
KEY(SVNDIFF, "Show svn history of file..", 0)
KEY(PATCH, "Patch/diff..", 0)
KEY(PATCH, "Patch/diff..", 0)