From 75ee5bce8c2f6d8c4581993e82d7316fe84db183 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 26 Nov 2010 10:20:50 +0100
Subject: [PATCH] debugger: make DebuggerEngine::acceptsBreakpoint(id) pure
---
src/plugins/debugger/debuggerengine.cpp | 5 -----
src/plugins/debugger/debuggerengine.h | 2 +-
src/plugins/debugger/debuggerplugin.cpp | 19 ++++++++++---------
src/plugins/debugger/lldb/ipcenginehost.h | 1 +
src/plugins/debugger/lldb/lldbenginehost.cpp | 2 +-
src/plugins/debugger/qml/qmlcppengine.cpp | 2 +-
src/plugins/debugger/qml/qmlcppengine.h | 4 ++--
src/plugins/debugger/qml/qmlengine.cpp | 2 +-
src/plugins/debugger/qml/qmlengine.h | 2 +-
src/plugins/debugger/script/scriptengine.cpp | 6 ++++++
src/plugins/debugger/script/scriptengine.h | 1 +
src/plugins/debugger/tcf/tcfengine.h | 4 +++-
12 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index c077b64a2f3..d198a9a7256 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -1237,11 +1237,6 @@ void DebuggerEngine::attemptBreakpointSynchronization()
d->m_disassemblerViewAgent.updateBreakpointMarkers();
}
-bool DebuggerEngine::acceptsBreakpoint(BreakpointId) const
-{
- return true;
-}
-
void DebuggerEngine::insertBreakpoint(BreakpointId)
{
QTC_ASSERT(false, /**/);
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index b8f4eba04f4..af29b472770 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -188,7 +188,7 @@ public:
virtual bool stateAcceptsBreakpointChanges() const { return true; }
virtual void attemptBreakpointSynchronization();
- virtual bool acceptsBreakpoint(BreakpointId id) const; // FIXME: make pure
+ virtual bool acceptsBreakpoint(BreakpointId id) const = 0;
virtual void insertBreakpoint(BreakpointId id); // FIXME: make pure
virtual void removeBreakpoint(BreakpointId id); // FIXME: make pure
virtual void changeBreakpoint(BreakpointId id); // FIXME: make pure
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 75faf27b88f..2d75be180b9 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -475,15 +475,16 @@ class DummyEngine : public DebuggerEngine
public:
DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {}
- virtual ~DummyEngine() {}
-
- virtual void setupEngine() {}
- virtual void setupInferior() {}
- virtual void runEngine() {}
- virtual void shutdownEngine() {}
- virtual void shutdownInferior() {}
- virtual void executeDebuggerCommand(const QString &) {}
- virtual unsigned debuggerCapabilities() const { return 0; }
+ ~DummyEngine() {}
+
+ void setupEngine() {}
+ void setupInferior() {}
+ void runEngine() {}
+ void shutdownEngine() {}
+ void shutdownInferior() {}
+ void executeDebuggerCommand(const QString &) {}
+ unsigned debuggerCapabilities() const { return 0; }
+ bool acceptsBreakpoint(BreakpointId) const { return false; }
};
static DebuggerEngine *dummyEngine()
diff --git a/src/plugins/debugger/lldb/ipcenginehost.h b/src/plugins/debugger/lldb/ipcenginehost.h
index a36508bdf87..5bedd98cf4d 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.h
+++ b/src/plugins/debugger/lldb/ipcenginehost.h
@@ -104,6 +104,7 @@ public:
void activateFrame(int index);
void selectThread(int index);
void fetchDisassembler(DisassemblerViewAgent *);
+ bool acceptsBreakpoint(BreakpointId) const { return true; } // FIXME
void insertBreakpoint(BreakpointId id);
void removeBreakpoint(BreakpointId id);
void changeBreakpoint(BreakpointId id);
diff --git a/src/plugins/debugger/lldb/lldbenginehost.cpp b/src/plugins/debugger/lldb/lldbenginehost.cpp
index 01bb358148c..42a8d22cac9 100644
--- a/src/plugins/debugger/lldb/lldbenginehost.cpp
+++ b/src/plugins/debugger/lldb/lldbenginehost.cpp
@@ -96,7 +96,7 @@ LLDBEngineHost::~LLDBEngineHost()
m_guestp->kill();
}
-void LLDBEngineHost::finished (int, QProcess::ExitStatus)
+void LLDBEngineHost::finished(int, QProcess::ExitStatus)
{
showStatusMessage(QLatin1String("lldb crashed"));
notifyEngineIll();
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 35c49fef75b..eeb83f97dae 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -242,7 +242,7 @@ void QmlCppEngine::attemptBreakpointSynchronization()
static_cast<DebuggerEngine*>(d->m_qmlEngine)->attemptBreakpointSynchronization();
}
-bool QmlCppEngine::acceptsBreakpoint(BreakpointId id)
+bool QmlCppEngine::acceptsBreakpoint(BreakpointId id) const
{
return d->m_cppEngine->acceptsBreakpoint(id)
|| d->m_qmlEngine->acceptsBreakpoint(id);
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 135ca6c602b..839ed200f2a 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -56,10 +56,10 @@ public:
virtual void updateAll();
virtual void attemptBreakpointSynchronization();
- virtual bool acceptsBreakpoint(BreakpointId id);
+ virtual bool acceptsBreakpoint(BreakpointId id) const;
virtual void selectThread(int index);
- virtual void assignValueInDebugger(const Internal::WatchData *w,
+ virtual void assignValueInDebugger(const Internal::WatchData *data,
const QString &expr, const QVariant &value);
QAbstractItemModel *modulesModel() const;
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index f6a24a6c56c..0bd66f02ed7 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -494,7 +494,7 @@ void QmlEngine::attemptBreakpointSynchronization()
sendMessage(reply);
}
-bool QmlEngine::acceptsBreakpoint(BreakpointId id)
+bool QmlEngine::acceptsBreakpoint(BreakpointId id) const
{
const QString fileName = breakHandler()->fileName(id);
return fileName.endsWith(QLatin1String(".qml"))
diff --git a/src/plugins/debugger/qml/qmlengine.h b/src/plugins/debugger/qml/qmlengine.h
index b8ebe4098b5..e1e952fa38e 100644
--- a/src/plugins/debugger/qml/qmlengine.h
+++ b/src/plugins/debugger/qml/qmlengine.h
@@ -93,7 +93,7 @@ private:
void selectThread(int index);
void attemptBreakpointSynchronization();
- bool acceptsBreakpoint(BreakpointId id);
+ bool acceptsBreakpoint(BreakpointId id) const;
void assignValueInDebugger(const Internal::WatchData *data,
const QString &expr, const QVariant &value);
diff --git a/src/plugins/debugger/script/scriptengine.cpp b/src/plugins/debugger/script/scriptengine.cpp
index 28db907659f..8b5d349964f 100644
--- a/src/plugins/debugger/script/scriptengine.cpp
+++ b/src/plugins/debugger/script/scriptengine.cpp
@@ -447,6 +447,12 @@ void ScriptEngine::selectThread(int index)
Q_UNUSED(index)
}
+bool ScriptEngine::acceptsBreakpoint(BreakpointId id) const
+{
+ const QString fileName = breakHandler()->fileName(id);
+ return fileName.endsWith(QLatin1String(".js"));
+}
+
void ScriptEngine::attemptBreakpointSynchronization()
{
QTC_ASSERT(false, /* FIXME */);
diff --git a/src/plugins/debugger/script/scriptengine.h b/src/plugins/debugger/script/scriptengine.h
index d73a2e034f0..e2507c36489 100644
--- a/src/plugins/debugger/script/scriptengine.h
+++ b/src/plugins/debugger/script/scriptengine.h
@@ -87,6 +87,7 @@ private:
void activateFrame(int index);
void selectThread(int index);
+ bool acceptsBreakpoint(BreakpointId id) const;
void attemptBreakpointSynchronization();
void assignValueInDebugger(const WatchData *w,
diff --git a/src/plugins/debugger/tcf/tcfengine.h b/src/plugins/debugger/tcf/tcfengine.h
index f6746066158..26d0241d204 100644
--- a/src/plugins/debugger/tcf/tcfengine.h
+++ b/src/plugins/debugger/tcf/tcfengine.h
@@ -92,8 +92,10 @@ private:
void selectThread(int index);
void attemptBreakpointSynchronization();
+ bool acceptsBreakpoint(BreakpointId) const { return false; }
- void assignValueInDebugger(const Internal::WatchData *w, const QString &expr, const QVariant &value);
+ void assignValueInDebugger(const WatchData *data,
+ const QString &expr, const QVariant &value);
void executeDebuggerCommand(const QString &command);
void loadSymbols(const QString &moduleName);
--
GitLab