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

Debugger: Remove the dependence on QmlJSTools

Browse Source 
Change-Id: I26765134c19b9a6cf1e7ad26f313e2d4f8faf258
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
This commit is contained in:
Aurindam Jana
2012-10-08 13:17:10 +02:00
parent 3ebbba2e07
commit 1d04c4c3df
31 changed files with 451 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,8 +43,8 @@
#include <coreplugin/editormanager/editormanager.h>
#include <texteditor/basetexteditor.h>
#include <qmljstools/qmlconsoleitem.h>
#include <qmljstools/qmlconsolemanager.h>
#include <qmljs/consolemanagerinterface.h>
#include <qmljs/consoleitem.h>
#include <QTextBlock>
#include <QVariant>
@@ -1748,11 +1748,11 @@ void QmlV8DebuggerClient::updateScope(const QVariant &bodyVal, const QVariant &r
d->engine->watchHandler()->insertData(locals);
}
QmlJSTools::QmlConsoleItem *constructLogItemTree(QmlJSTools::QmlConsoleItem *parent,
QmlJS::ConsoleItem *constructLogItemTree(QmlJS::ConsoleItem *parent,
const QmlV8ObjectData &objectData,
const QVariant &refsVal)
{
using namespace QmlJSTools;
using namespace QmlJS;
bool sorted = debuggerCore()->boolSetting(SortStructMembers);
if (!objectData.value.isValid())
return 0;
@@ -1764,10 +1764,10 @@ QmlJSTools::QmlConsoleItem *constructLogItemTree(QmlJSTools::QmlConsoleItem *par
text = QString(_("%1: %2")).arg(QString::fromAscii(objectData.name))
.arg(objectData.value.toString());
QmlConsoleItem *item = new QmlConsoleItem(parent, QmlConsoleItem::UndefinedType, text);
ConsoleItem *item = new ConsoleItem(parent, ConsoleItem::UndefinedType, text);
foreach (const QVariant &property, objectData.properties) {
QmlConsoleItem *child = constructLogItemTree(item, extractData(property, refsVal),
ConsoleItem *child = constructLogItemTree(item, extractData(property, refsVal),
refsVal);
if (child)
item->insertChild(child, sorted);
@@ -1802,10 +1802,10 @@ void QmlV8DebuggerClient::updateEvaluationResult(int sequence, bool success,
} else if (d->debuggerCommands.contains(sequence)) {
d->updateLocalsAndWatchers.removeOne(sequence);
QmlV8ObjectData body = extractData(bodyVal, refsVal);
using namespace QmlJSTools;
QmlConsoleManager *consoleManager = QmlConsoleManager::instance();
using namespace QmlJS;
ConsoleManagerInterface *consoleManager = ConsoleManagerInterface::instance();
if (consoleManager) {
QmlConsoleItem *item = constructLogItemTree(consoleManager->rootItem(), body, refsVal);
ConsoleItem *item = constructLogItemTree(consoleManager->rootItem(), body, refsVal);
if (item)
consoleManager->printToConsolePane(item);
}