feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Cdbext: Do not sort container children.

Browse Source 
They are already sorted in an intended order.

Task-number: QTCREATORBUG-14872
Change-Id: If28d41eb220cb875fa5ef25f0fab075329900bff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
This commit is contained in:
David Schulz
2015-08-12 11:12:50 +02:00
parent 4f50aa74d6
commit 537eb2f159
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/libs/qtcreatorcdbext/containers.cpp
View File

@@ -1104,6 +1104,7 @@ AbstractSymbolGroupNodePtrVector containerChildren(SymbolGroupNode *node, int ty
} }
if (!size) if (!size)
return AbstractSymbolGroupNodePtrVector(); return AbstractSymbolGroupNodePtrVector();
node->addFlags(SymbolGroupNode::PreSortedChildren);
const unsigned maxArraySize = ExtensionContext::instance().parameters().maxArraySize; const unsigned maxArraySize = ExtensionContext::instance().parameters().maxArraySize;
if (size > maxArraySize) if (size > maxArraySize)
size = maxArraySize; size = maxArraySize;

2
src/libs/qtcreatorcdbext/symbolgroupnode.cpp
View File

@@ -168,7 +168,7 @@ bool AbstractSymbolGroupNode::accept(SymbolGroupNodeVisitor &visitor,
break; break;
case SymbolGroupNodeVisitor::VisitContinue: { case SymbolGroupNodeVisitor::VisitContinue: {
AbstractSymbolGroupNodePtrVector c = children(); AbstractSymbolGroupNodePtrVector c = children();
if (visitor.sortChildrenAlphabetically()) { if (visitor.sortChildrenAlphabetically() && !testFlags(SymbolGroupNode::PreSortedChildren)) {
std::sort(c.begin(), c.end(), [](AbstractSymbolGroupNode *a, AbstractSymbolGroupNode *b) { std::sort(c.begin(), c.end(), [](AbstractSymbolGroupNode *a, AbstractSymbolGroupNode *b) {
return a->name() < b->name(); return a->name() < b->name();
}); });

3
src/libs/qtcreatorcdbext/symbolgroupnode.h
View File

@@ -230,7 +230,8 @@ public:
AdditionalSymbol = 0x20, // Introduced by addSymbol, should not be visible AdditionalSymbol = 0x20, // Introduced by addSymbol, should not be visible
Obscured = 0x40, // Symbol is obscured by (for example) fake container children Obscured = 0x40, // Symbol is obscured by (for example) fake container children
ComplexDumperOk = 0x80, ComplexDumperOk = 0x80,
WatchNode = 0x100 WatchNode = 0x100,
PreSortedChildren = 0x200
}; };
~SymbolGroupNode(); ~SymbolGroupNode();