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

ide: Fixed empty name issue Navigator #497

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6214 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-07-29 16:50:36 +00:00
parent 48fddd66da
commit 394340583f
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Sql/Sqls.h
View file

@ -250,7 +250,7 @@ public:
String Savepoint(); // deprecated
void RollbackTo(const String& savepoint); // deprecated
bool IsOpen(); //
bool IsOpen();
bool WasError() const; // deprecated, use SqlSession::WasError

7
uppsrc/ide/Browser/Item.cpp
View file

@ -74,6 +74,9 @@ Vector<ItemTextPart> ParseItemNatural(const String& name, const CppItem& m, cons
LLOG("ParseItemNatural " << m.natural << ", pname: " << m.pname
<< ", tname: " << m.tname << ", m.ctname: " << m.ctname);
Vector<ItemTextPart> part;
int len = name.GetLength();
if(len == 0)
return part;
bool param = false;
int pari = -1;
int par = 0;
@ -90,9 +93,9 @@ Vector<ItemTextPart> ParseItemNatural(const String& name, const CppItem& m, cons
}
else
if(iscid(*s) || *s == ':') {
if(strncmp(s, name, name.GetLength()) == 0 && !iscid(s[name.GetLength()])) {
if(strncmp(s, name, len) == 0 && !iscid(s[len])) {
p.type = ITEM_NAME;
n = name.GetLength();
n = len;
param = true;
}
else {