From 6b8b2e63eaabbae4fcb656395d0a719aebf506a3 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Mon, 22 Aug 2011 17:23:34 +0200
Subject: [PATCH] Refactoring v8debuggerclient and scriptdebuggerclient
Change-Id: Ifa2e9a9901a166907bd7c3999421146b07bd1c59
Reviewed-on: http://codereview.qt.nokia.com/3328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
---
src/plugins/debugger/qml/qmldebuggerclient.h | 6 +++---
src/plugins/debugger/qml/qmlengine.cpp | 12 ++++++------
src/plugins/debugger/qml/qmlv8debuggerclient.cpp | 7 ++++---
src/plugins/debugger/qml/qmlv8debuggerclient.h | 6 +++---
src/plugins/debugger/qml/qscriptdebuggerclient.cpp | 8 +++++---
src/plugins/debugger/qml/qscriptdebuggerclient.h | 6 +++---
6 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/src/plugins/debugger/qml/qmldebuggerclient.h b/src/plugins/debugger/qml/qmldebuggerclient.h
index a7391f65b0e..69ceb86fc7d 100644
--- a/src/plugins/debugger/qml/qmldebuggerclient.h
+++ b/src/plugins/debugger/qml/qmldebuggerclient.h
@@ -65,9 +65,9 @@ public:
virtual void activateFrame(int index) = 0;
- virtual void insertBreakpoint(BreakpointModelId id, BreakHandler *handler) = 0;
- virtual void removeBreakpoint(BreakpointModelId id, BreakHandler *handler) = 0;
- virtual void changeBreakpoint(BreakpointModelId id, BreakHandler *handler) = 0;
+ virtual void insertBreakpoint(BreakpointModelId id) = 0;
+ virtual void removeBreakpoint(BreakpointModelId id) = 0;
+ virtual void changeBreakpoint(BreakpointModelId id) = 0;
virtual void updateBreakpoints() = 0;
virtual void assignValueInDebugger(const QByteArray expr, const quint64 &id,
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 0af34b13575..edc58b7a62b 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -502,10 +502,10 @@ void QmlEngine::insertBreakpoint(BreakpointModelId id)
handler->notifyBreakpointInsertProceeding(id);
if (d->m_adapter.activeDebuggerClient()) {
- d->m_adapter.activeDebuggerClient()->insertBreakpoint(id,handler);
+ d->m_adapter.activeDebuggerClient()->insertBreakpoint(id);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
- client->insertBreakpoint(id,handler);
+ client->insertBreakpoint(id);
}
}
@@ -522,10 +522,10 @@ void QmlEngine::removeBreakpoint(BreakpointModelId id)
handler->notifyBreakpointRemoveProceeding(id);
if (d->m_adapter.activeDebuggerClient()) {
- d->m_adapter.activeDebuggerClient()->removeBreakpoint(id,handler);
+ d->m_adapter.activeDebuggerClient()->removeBreakpoint(id);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
- client->removeBreakpoint(id,handler);
+ client->removeBreakpoint(id);
}
}
@@ -542,10 +542,10 @@ void QmlEngine::changeBreakpoint(BreakpointModelId id)
handler->notifyBreakpointChangeProceeding(id);
if (d->m_adapter.activeDebuggerClient()) {
- d->m_adapter.activeDebuggerClient()->changeBreakpoint(id,handler);
+ d->m_adapter.activeDebuggerClient()->changeBreakpoint(id);
} else {
foreach (QmlDebuggerClient *client, d->m_adapter.debuggerClients()) {
- client->changeBreakpoint(id,handler);
+ client->changeBreakpoint(id);
}
}
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 2a6c4f5f33c..9505dbaf654 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -221,8 +221,9 @@ void QmlV8DebuggerClient::activateFrame(int index)
setLocals(index);
}
-void QmlV8DebuggerClient::insertBreakpoint(BreakpointModelId id, BreakHandler *handler)
+void QmlV8DebuggerClient::insertBreakpoint(BreakpointModelId id)
{
+ BreakHandler *handler = d->engine->breakHandler();
QByteArray request;
JsonInputStream(request) << '{' << INITIALPARAMS ;
@@ -243,7 +244,7 @@ void QmlV8DebuggerClient::insertBreakpoint(BreakpointModelId id, BreakHandler *h
sendMessage(packMessage(request));
}
-void QmlV8DebuggerClient::removeBreakpoint(BreakpointModelId id, BreakHandler * /*handler*/)
+void QmlV8DebuggerClient::removeBreakpoint(BreakpointModelId id)
{
QList<int> breakpoints = d->breakpoints.values(id);
d->breakpoints.remove(id);
@@ -264,7 +265,7 @@ void QmlV8DebuggerClient::removeBreakpoint(BreakpointModelId id, BreakHandler *
}
}
-void QmlV8DebuggerClient::changeBreakpoint(BreakpointModelId /*id*/, BreakHandler * /*handler*/)
+void QmlV8DebuggerClient::changeBreakpoint(BreakpointModelId /*id*/)
{
}
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.h b/src/plugins/debugger/qml/qmlv8debuggerclient.h
index b3ff37bd4e8..ef742124f05 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.h
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.h
@@ -65,9 +65,9 @@ public:
void activateFrame(int index);
- void insertBreakpoint(BreakpointModelId id, BreakHandler *handler);
- void removeBreakpoint(BreakpointModelId id, BreakHandler *handler);
- void changeBreakpoint(BreakpointModelId id, BreakHandler *handler);
+ void insertBreakpoint(BreakpointModelId id);
+ void removeBreakpoint(BreakpointModelId id);
+ void changeBreakpoint(BreakpointModelId id);
void updateBreakpoints();
void assignValueInDebugger(const QByteArray expr, const quint64 &id,
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
index 692fef36e76..bfe05312233 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.cpp
@@ -210,8 +210,9 @@ void QScriptDebuggerClient::activateFrame(int index)
sendMessage(reply);
}
-void QScriptDebuggerClient::insertBreakpoint(BreakpointModelId id, BreakHandler *handler)
+void QScriptDebuggerClient::insertBreakpoint(BreakpointModelId id)
{
+ BreakHandler *handler = d->engine->breakHandler();
JSAgentBreakpointData bp;
bp.fileUrl = QUrl::fromLocalFile(handler->fileName(id)).toString().toUtf8();
bp.lineNumber = handler->lineNumber(id);
@@ -219,8 +220,9 @@ void QScriptDebuggerClient::insertBreakpoint(BreakpointModelId id, BreakHandler
d->breakpoints.insert(bp);
}
-void QScriptDebuggerClient::removeBreakpoint(BreakpointModelId id, BreakHandler *handler)
+void QScriptDebuggerClient::removeBreakpoint(BreakpointModelId id)
{
+ BreakHandler *handler = d->engine->breakHandler();
JSAgentBreakpointData bp;
bp.fileUrl = QUrl::fromLocalFile(handler->fileName(id)).toString().toUtf8();
bp.lineNumber = handler->lineNumber(id);
@@ -228,7 +230,7 @@ void QScriptDebuggerClient::removeBreakpoint(BreakpointModelId id, BreakHandler
d->breakpoints.remove(bp);
}
-void QScriptDebuggerClient::changeBreakpoint(BreakpointModelId /*id*/, BreakHandler * /*handler*/)
+void QScriptDebuggerClient::changeBreakpoint(BreakpointModelId /*id*/)
{
}
diff --git a/src/plugins/debugger/qml/qscriptdebuggerclient.h b/src/plugins/debugger/qml/qscriptdebuggerclient.h
index 6723347f016..79318cd806e 100644
--- a/src/plugins/debugger/qml/qscriptdebuggerclient.h
+++ b/src/plugins/debugger/qml/qscriptdebuggerclient.h
@@ -64,9 +64,9 @@ public:
void activateFrame(int index);
- void insertBreakpoint(BreakpointModelId id, BreakHandler *handler);
- void removeBreakpoint(BreakpointModelId id, BreakHandler *handler);
- void changeBreakpoint(BreakpointModelId id, BreakHandler *handler);
+ void insertBreakpoint(BreakpointModelId id);
+ void removeBreakpoint(BreakpointModelId id);
+ void changeBreakpoint(BreakpointModelId id);
void updateBreakpoints();
void assignValueInDebugger(const QByteArray expr, const quint64 &id,
--
GitLab