Commit b9dfbd8e authored by Aurindam Jana's avatar Aurindam Jana Committed by hjk
Browse files

QtMessageLogHandler: Sorting child items



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

Change-Id: Ib21803326ec3f35c9541c08d876c4a38c0202a9f
Reviewed-by: default avatarhjk <qthjk@ovi.com>
parent e9e80488
......@@ -1309,7 +1309,7 @@ QtMessageLogItem *QmlEngine::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree(item,
i.value(), i.key());
if (child)
item->insertChildSorted(child);
item->insertChild(child);
}
} else if (result.type() == QVariant::List) {
if (key.isEmpty())
......@@ -1321,7 +1321,7 @@ QtMessageLogItem *QmlEngine::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree(item, resultList.at(i),
QString::number(i));
if (child)
item->insertChildSorted(child);
item->insertChild(child);
}
} else if (result.canConvert(QVariant::String)) {
item->text = result.toString();
......
......@@ -995,7 +995,7 @@ QtMessageLogItem *QmlV8DebuggerClientPrivate::constructLogItemTree(
QtMessageLogItem *child = constructLogItemTree(
item, extractData(property, refsVal), refsVal);
if (child)
item->insertChildSorted(child);
item->insertChild(child);
}
return item;
......
......@@ -31,6 +31,8 @@
**************************************************************************/
#include "qtmessageloghandler.h"
#include "debuggercore.h"
#include "debuggeractions.h"
#include <utils/qtcassert.h>
......@@ -94,8 +96,13 @@ bool QtMessageLogItem::insertChildren(int position, int count)
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;
for (; i < m_childItems.count(); i++) {
if (item->text < m_childItems[i]->text) {
......
......@@ -126,7 +126,7 @@ public:
QtMessageLogItem *child(int number);
int childCount() const;
bool insertChildren(int position, int count);
void insertChildSorted(QtMessageLogItem *item);
void insertChild(QtMessageLogItem *item);
bool insertChild(int position, QtMessageLogItem *item);
QtMessageLogItem *parent();
bool removeChildren(int position, int count);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment