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

Debugger: Merge {baseqml,qml}debuggerclient.

Browse Source 
Abstraction is not used after the demise of QScriptDebuggerClient
and unlikely to be used again.

Change-Id: Icdd6615eb0d1468fd9a3d717d6a7d5e44f7f7d79
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
hjk
2015-07-08 12:21:51 +02:00
parent 7e30a74d41
commit 0e7e521a0a
9 changed files with 53 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,8 +29,8 @@
****************************************************************************/
#include "qmlengine.h"
#include "baseqmldebuggerclient.h"
#include "qmlinspectoragent.h"
#include "qmlv8debuggerclient.h"
#include <debugger/debuggeractions.h>
#include <debugger/debuggercore.h>
@@ -821,7 +821,7 @@ void QmlEngine::insertBreakpoint(Breakpoint bp)
if (m_adapter.activeDebuggerClient()) {
m_adapter.activeDebuggerClient()->insertBreakpoint(bp, line, column);
} else {
foreach (BaseQmlDebuggerClient *client, m_adapter.debuggerClients()) {
foreach (QmlV8DebuggerClient *client, m_adapter.debuggerClients()) {
client->insertBreakpoint(bp, line, column);
}
}
@@ -849,7 +849,7 @@ void QmlEngine::removeBreakpoint(Breakpoint bp)
if (m_adapter.activeDebuggerClient()) {
m_adapter.activeDebuggerClient()->removeBreakpoint(bp);
} else {
foreach (BaseQmlDebuggerClient *client, m_adapter.debuggerClients()) {
foreach (QmlV8DebuggerClient *client, m_adapter.debuggerClients()) {
client->removeBreakpoint(bp);
}
}
@@ -867,7 +867,7 @@ void QmlEngine::changeBreakpoint(Breakpoint bp)
if (m_adapter.activeDebuggerClient()) {
m_adapter.activeDebuggerClient()->changeBreakpoint(bp);
} else {
foreach (BaseQmlDebuggerClient *client, m_adapter.debuggerClients()) {
foreach (QmlV8DebuggerClient *client, m_adapter.debuggerClients()) {
client->changeBreakpoint(bp);
}
}
@@ -922,7 +922,7 @@ void QmlEngine::attemptBreakpointSynchronization()
if (m_adapter.activeDebuggerClient()) {
m_adapter.activeDebuggerClient()->synchronizeBreakpoints();
} else {
foreach (BaseQmlDebuggerClient *client, m_adapter.debuggerClients()) {
foreach (QmlV8DebuggerClient *client, m_adapter.debuggerClients()) {
client->synchronizeBreakpoints();
}
}
@@ -1035,7 +1035,7 @@ void QmlEngine::synchronizeWatchers()
if (m_adapter.activeDebuggerClient()) {
m_adapter.activeDebuggerClient()->synchronizeWatchers(watchedExpressions);
} else {
foreach (BaseQmlDebuggerClient *client, m_adapter.debuggerClients())
foreach (QmlV8DebuggerClient *client, m_adapter.debuggerClients())
client->synchronizeWatchers(watchedExpressions);
}
}