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

QtMessageLogHandler: Sorting child items

Browse Source 
Insert child items in sorted order if the "Sort Members and
Classes Alphabetically" is set in Locals And Expressions.

Change-Id: Ib21803326ec3f35c9541c08d876c4a38c0202a9f
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
Aurindam Jana
2012-03-22 12:00:47 +01:00
committed by hjk
parent e9e804888e
commit b9dfbd8ec3
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -1309,7 +1309,7 @@ QtMessageLogItem *QmlEngine::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree(item, QtMessageLogItem *child = constructLogItemTree(item,
i.value(), i.key()); i.value(), i.key());
if (child) if (child)
item->insertChildSorted(child); item->insertChild(child);
} }
} else if (result.type() == QVariant::List) { } else if (result.type() == QVariant::List) {
if (key.isEmpty()) if (key.isEmpty())
@@ -1321,7 +1321,7 @@ QtMessageLogItem *QmlEngine::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree(item, resultList.at(i), QtMessageLogItem *child = constructLogItemTree(item, resultList.at(i),
QString::number(i)); QString::number(i));
if (child) if (child)
item->insertChildSorted(child); item->insertChild(child);
} }
} else if (result.canConvert(QVariant::String)) { } else if (result.canConvert(QVariant::String)) {
item->text = result.toString(); item->text = result.toString();

2
src/plugins/debugger/qml/qmlv8debuggerclient.cpp
View File

@@ -995,7 +995,7 @@ QtMessageLogItem *QmlV8DebuggerClientPrivate::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree( QtMessageLogItem *child = constructLogItemTree(
item, extractData(property, refsVal), refsVal); item, extractData(property, refsVal), refsVal);
if (child) if (child)
item->insertChildSorted(child); item->insertChild(child);
} }
return item; return item;

9
src/plugins/debugger/qtmessageloghandler.cpp
View File

@@ -31,6 +31,8 @@
**************************************************************************/ **************************************************************************/
#include "qtmessageloghandler.h" #include "qtmessageloghandler.h"
#include "debuggercore.h"
#include "debuggeractions.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
@@ -94,8 +96,13 @@ bool QtMessageLogItem::insertChildren(int position, int count)
return true; return true;
} }
void QtMessageLogItem::insertChildSorted(QtMessageLogItem *item) void QtMessageLogItem::insertChild(QtMessageLogItem *item)
{ {
if (!debuggerCore()->boolSetting(SortStructMembers)) {
m_childItems.insert(m_childItems.count(), item);
return;
}
int i = 0; int i = 0;
for (; i < m_childItems.count(); i++) { for (; i < m_childItems.count(); i++) {
if (item->text < m_childItems[i]->text) { if (item->text < m_childItems[i]->text) {

2
src/plugins/debugger/qtmessageloghandler.h
View File

@@ -126,7 +126,7 @@ public:
QtMessageLogItem *child(int number); QtMessageLogItem *child(int number);
int childCount() const; int childCount() const;
bool insertChildren(int position, int count); bool insertChildren(int position, int count);
void insertChildSorted(QtMessageLogItem *item); void insertChild(QtMessageLogItem *item);
bool insertChild(int position, QtMessageLogItem *item); bool insertChild(int position, QtMessageLogItem *item);
QtMessageLogItem *parent(); QtMessageLogItem *parent();
bool removeChildren(int position, int count); bool removeChildren(int position, int count);