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

QmlDebug: Rename library and (most) classes

Browse Source 
Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib).

Also rename
 - QDeclarativeDebug* classes to QmlDebug*
 - QDeclarativeOutputParser class to QmlOutputParser

To clarify the features,
 - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient
 - QmlEngineDebugClient is now BaseEngineDebugClient
 - QmlDebuggerClient is now QmlEngineDebugClient
 - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient

Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-04-18 12:06:10 +02:00
parent 53702d5dcc
commit 4d3395b990
67 changed files with 604 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,6 +33,7 @@
#include "qmlengine.h"
#include "qmladapter.h"
#include "interactiveinterpreter.h"
#include "baseqmldebuggerclient.h"
#include "debuggerstartparameters.h"
#include "debuggeractions.h"
@@ -56,8 +57,8 @@
#include <extensionsystem/pluginmanager.h>
#include <projectexplorer/applicationlauncher.h>
#include <qmljsdebugclient/qdeclarativeoutputparser.h>
#include <qmljsdebugclient/qmlenginedebugclient.h>
#include <qmldebug/qmloutputparser.h>
#include <qmldebug/baseenginedebugclient.h>
#include <qmljseditor/qmljseditorconstants.h>
#include <qmljs/parser/qmljsast_p.h>
#include <qmljs/qmljsmodelmanagerinterface.h>
@@ -114,7 +115,7 @@ private:
QmlAdapter m_adapter;
ApplicationLauncher m_applicationLauncher;
QTimer m_noDebugOutputTimer;
QmlJsDebugClient::QDeclarativeOutputParser m_outputParser;
QmlDebug::QmlOutputParser m_outputParser;
QHash<QString, QTextDocument*> m_sourceDocuments;
QHash<QString, QWeakPointer<TextEditor::ITextEditor> > m_sourceEditors;
InteractiveInterpreter m_interpreter;
@@ -329,9 +330,9 @@ QmlEngine::QmlEngine(const DebuggerStartParameters &startParameters,
SLOT(updateCurrentContext()));
connect(d->m_adapter.messageClient(),
SIGNAL(message(QtMsgType,QString,
QmlJsDebugClient::QDebugContextInfo)),
QmlDebug::QDebugContextInfo)),
SLOT(appendDebugOutput(QtMsgType,QString,
QmlJsDebugClient::QDebugContextInfo)));
QmlDebug::QDebugContextInfo)));
connect(&d->m_applicationLauncher,
SIGNAL(processExited(int)),
@@ -836,7 +837,7 @@ void QmlEngine::insertBreakpoint(BreakpointModelId id)
if (d->m_adapter.activeDebuggerClient()) {
d->m_adapter.activeDebuggerClient()->insertBreakpoint(id, line, column);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
client->insertBreakpoint(id, line, column);
}
}
@@ -867,7 +868,7 @@ void QmlEngine::removeBreakpoint(BreakpointModelId id)
if (d->m_adapter.activeDebuggerClient()) {
d->m_adapter.activeDebuggerClient()->removeBreakpoint(id);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
client->removeBreakpoint(id);
}
}
@@ -887,7 +888,7 @@ void QmlEngine::changeBreakpoint(BreakpointModelId id)
if (d->m_adapter.activeDebuggerClient()) {
d->m_adapter.activeDebuggerClient()->changeBreakpoint(id);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
client->changeBreakpoint(id);
}
}
@@ -943,7 +944,7 @@ void QmlEngine::attemptBreakpointSynchronization()
if (d->m_adapter.activeDebuggerClient()) {
d->m_adapter.activeDebuggerClient()->synchronizeBreakpoints();
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
client->synchronizeBreakpoints();
}
}
@@ -1051,7 +1052,7 @@ void QmlEngine::synchronizeWatchers()
if (d->m_adapter.activeDebuggerClient()) {
d->m_adapter.activeDebuggerClient()->synchronizeWatchers(watchedExpressions);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients())
foreach (BaseQmlDebuggerClient *client, d->m_adapter.debuggerClients())
client->synchronizeWatchers(watchedExpressions);
}
}
@@ -1116,7 +1117,7 @@ void QmlEngine::updateCurrentContext()
}
void QmlEngine::appendDebugOutput(QtMsgType type, const QString &message,
const QmlJsDebugClient::QDebugContextInfo &info)
const QmlDebug::QDebugContextInfo &info)
{
QtMessageLogHandler::ItemType itemType;
switch (type) {
@@ -1162,7 +1163,7 @@ bool QmlEngine::evaluateScriptExpression(const QString& expression)
//is sent to V8DebugService. In all other cases, the
//expression is evaluated by QDeclarativeEngine.
if (state() != InferiorStopOk) {
QmlEngineDebugClient *engineDebug =
BaseEngineDebugClient *engineDebug =
d->m_adapter.engineDebugClient();
int id = d->m_adapter.currentSelectedDebugId();