debugger: make DebuggerEngine::acceptsBreakpoint(id) pure

This commit is contained in:
hjk
2010-11-26 10:20:50 +01:00
parent 7d8d51677b
commit 75ee5bce8c
12 changed files with 27 additions and 21 deletions

View File

@@ -1237,11 +1237,6 @@ void DebuggerEngine::attemptBreakpointSynchronization()
d->m_disassemblerViewAgent.updateBreakpointMarkers(); d->m_disassemblerViewAgent.updateBreakpointMarkers();
} }
bool DebuggerEngine::acceptsBreakpoint(BreakpointId) const
{
return true;
}
void DebuggerEngine::insertBreakpoint(BreakpointId) void DebuggerEngine::insertBreakpoint(BreakpointId)
{ {
QTC_ASSERT(false, /**/); QTC_ASSERT(false, /**/);

View File

@@ -188,7 +188,7 @@ public:
virtual bool stateAcceptsBreakpointChanges() const { return true; } virtual bool stateAcceptsBreakpointChanges() const { return true; }
virtual void attemptBreakpointSynchronization(); 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 insertBreakpoint(BreakpointId id); // FIXME: make pure
virtual void removeBreakpoint(BreakpointId id); // FIXME: make pure virtual void removeBreakpoint(BreakpointId id); // FIXME: make pure
virtual void changeBreakpoint(BreakpointId id); // FIXME: make pure virtual void changeBreakpoint(BreakpointId id); // FIXME: make pure

View File

@@ -475,15 +475,16 @@ class DummyEngine : public DebuggerEngine
public: public:
DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {} DummyEngine() : DebuggerEngine(DebuggerStartParameters()) {}
virtual ~DummyEngine() {} ~DummyEngine() {}
virtual void setupEngine() {} void setupEngine() {}
virtual void setupInferior() {} void setupInferior() {}
virtual void runEngine() {} void runEngine() {}
virtual void shutdownEngine() {} void shutdownEngine() {}
virtual void shutdownInferior() {} void shutdownInferior() {}
virtual void executeDebuggerCommand(const QString &) {} void executeDebuggerCommand(const QString &) {}
virtual unsigned debuggerCapabilities() const { return 0; } unsigned debuggerCapabilities() const { return 0; }
bool acceptsBreakpoint(BreakpointId) const { return false; }
}; };
static DebuggerEngine *dummyEngine() static DebuggerEngine *dummyEngine()

View File

@@ -104,6 +104,7 @@ public:
void activateFrame(int index); void activateFrame(int index);
void selectThread(int index); void selectThread(int index);
void fetchDisassembler(DisassemblerViewAgent *); void fetchDisassembler(DisassemblerViewAgent *);
bool acceptsBreakpoint(BreakpointId) const { return true; } // FIXME
void insertBreakpoint(BreakpointId id); void insertBreakpoint(BreakpointId id);
void removeBreakpoint(BreakpointId id); void removeBreakpoint(BreakpointId id);
void changeBreakpoint(BreakpointId id); void changeBreakpoint(BreakpointId id);

View File

@@ -242,7 +242,7 @@ void QmlCppEngine::attemptBreakpointSynchronization()
static_cast<DebuggerEngine*>(d->m_qmlEngine)->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) return d->m_cppEngine->acceptsBreakpoint(id)
|| d->m_qmlEngine->acceptsBreakpoint(id); || d->m_qmlEngine->acceptsBreakpoint(id);

View File

@@ -56,10 +56,10 @@ public:
virtual void updateAll(); virtual void updateAll();
virtual void attemptBreakpointSynchronization(); virtual void attemptBreakpointSynchronization();
virtual bool acceptsBreakpoint(BreakpointId id); virtual bool acceptsBreakpoint(BreakpointId id) const;
virtual void selectThread(int index); 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); const QString &expr, const QVariant &value);
QAbstractItemModel *modulesModel() const; QAbstractItemModel *modulesModel() const;

View File

@@ -494,7 +494,7 @@ void QmlEngine::attemptBreakpointSynchronization()
sendMessage(reply); sendMessage(reply);
} }
bool QmlEngine::acceptsBreakpoint(BreakpointId id) bool QmlEngine::acceptsBreakpoint(BreakpointId id) const
{ {
const QString fileName = breakHandler()->fileName(id); const QString fileName = breakHandler()->fileName(id);
return fileName.endsWith(QLatin1String(".qml")) return fileName.endsWith(QLatin1String(".qml"))

View File

@@ -93,7 +93,7 @@ private:
void selectThread(int index); void selectThread(int index);
void attemptBreakpointSynchronization(); void attemptBreakpointSynchronization();
bool acceptsBreakpoint(BreakpointId id); bool acceptsBreakpoint(BreakpointId id) const;
void assignValueInDebugger(const Internal::WatchData *data, void assignValueInDebugger(const Internal::WatchData *data,
const QString &expr, const QVariant &value); const QString &expr, const QVariant &value);

View File

@@ -447,6 +447,12 @@ void ScriptEngine::selectThread(int index)
Q_UNUSED(index) Q_UNUSED(index)
} }
bool ScriptEngine::acceptsBreakpoint(BreakpointId id) const
{
const QString fileName = breakHandler()->fileName(id);
return fileName.endsWith(QLatin1String(".js"));
}
void ScriptEngine::attemptBreakpointSynchronization() void ScriptEngine::attemptBreakpointSynchronization()
{ {
QTC_ASSERT(false, /* FIXME */); QTC_ASSERT(false, /* FIXME */);

View File

@@ -87,6 +87,7 @@ private:
void activateFrame(int index); void activateFrame(int index);
void selectThread(int index); void selectThread(int index);
bool acceptsBreakpoint(BreakpointId id) const;
void attemptBreakpointSynchronization(); void attemptBreakpointSynchronization();
void assignValueInDebugger(const WatchData *w, void assignValueInDebugger(const WatchData *w,

View File

@@ -92,8 +92,10 @@ private:
void selectThread(int index); void selectThread(int index);
void attemptBreakpointSynchronization(); 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 executeDebuggerCommand(const QString &command);
void loadSymbols(const QString &moduleName); void loadSymbols(const QString &moduleName);