diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 272f19b56182c349ccf676c15bae347c0c0747e2..2a356fdff4cbab2947234a4a7aabe2ea2599719c 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1361,7 +1361,7 @@ bool CdbEngine::attemptBreakpointSynchronizationI(QString *errorMessage)
return true;
}
-void CdbEngine::fetchDisassembler(DisassemblerViewAgent *agent)
+void CdbEngine::fetchDisassembler(DisassemblerAgent *agent)
{
enum { ContextLines = 40 };
QString errorMessage;
@@ -1387,7 +1387,7 @@ void CdbEngine::fetchDisassembler(DisassemblerViewAgent *agent)
agent->setContents(lines);
}
-void CdbEngine::fetchMemory(MemoryViewAgent *agent, QObject *token, quint64 addr, quint64 length)
+void CdbEngine::fetchMemory(MemoryAgent *agent, QObject *token, quint64 addr, quint64 length)
{
if (!m_d->m_hDebuggeeProcess && !length)
return;
diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h
index 24fab492a853b6817026b54ce60bce9f83335a4b..1f897e90e6c9bee37b95759bd17cdaab865ba281 100644
--- a/src/plugins/debugger/cdb/cdbengine.h
+++ b/src/plugins/debugger/cdb/cdbengine.h
@@ -37,7 +37,7 @@
namespace Debugger {
namespace Internal {
-class DisassemblerViewAgent;
+class DisassemblerAgent;
class CdbDebugEventCallback;
class CdbDebugOutput;
class CdbEnginePrivate;
@@ -88,8 +88,8 @@ public:
virtual void attemptBreakpointSynchronization();
virtual void setRegisterValue(int regnr, const QString &value);
- virtual void fetchDisassembler(DisassemblerViewAgent *agent);
- virtual void fetchMemory(MemoryViewAgent *, QObject *, quint64 addr, quint64 length);
+ virtual void fetchDisassembler(DisassemblerAgent *agent);
+ virtual void fetchMemory(MemoryAgent *, QObject *, quint64 addr, quint64 length);
virtual void reloadModules();
virtual void loadSymbols(const QString &moduleName);
diff --git a/src/plugins/debugger/cdb2/cdbengine2.cpp b/src/plugins/debugger/cdb2/cdbengine2.cpp
index fe56f3f2aa9ad7924c04ec8990e6bd494b799204..251229a575359ae50cd557edcca17f66251e5af0 100644
--- a/src/plugins/debugger/cdb2/cdbengine2.cpp
+++ b/src/plugins/debugger/cdb2/cdbengine2.cpp
@@ -71,8 +71,8 @@
#include <cctype>
-Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerViewAgent*)
-Q_DECLARE_METATYPE(Debugger::Internal::MemoryViewAgent*)
+Q_DECLARE_METATYPE(Debugger::Internal::DisassemblerAgent*)
+Q_DECLARE_METATYPE(Debugger::Internal::MemoryAgent*)
enum { debug = 0 };
enum { debugLocals = 0 };
@@ -115,11 +115,11 @@ static const char localsPrefixC[] = "local.";
using namespace Debugger::Internal;
struct MemoryViewCookie {
- explicit MemoryViewCookie(MemoryViewAgent *a = 0, QObject *e = 0,
+ explicit MemoryViewCookie(MemoryAgent *a = 0, QObject *e = 0,
quint64 addr = 0, quint64 l = 0) :
agent(a), editorToken(e), address(addr), length(l) {}
- MemoryViewAgent *agent;
+ MemoryAgent *agent;
QObject *editorToken;
quint64 address;
quint64 length;
@@ -1022,28 +1022,28 @@ void CdbEngine::selectThread(int index)
postBuiltinCommand(cmd, 0, &CdbEngine::dummyHandler, CommandListStack);
}
-void CdbEngine::fetchDisassembler(Debugger::Internal::DisassemblerViewAgent *agent)
+void CdbEngine::fetchDisassembler(Debugger::Internal::DisassemblerAgent *agent)
{
QTC_ASSERT(m_accessible, return;)
QByteArray cmd;
ByteArrayInputStream str(cmd);
str << "u " << hex << hexPrefixOn << agent->address() << " L40";
- const QVariant cookie = qVariantFromValue<Debugger::Internal::DisassemblerViewAgent*>(agent);
+ const QVariant cookie = qVariantFromValue<Debugger::Internal::DisassemblerAgent*>(agent);
postBuiltinCommand(cmd, 0, &CdbEngine::handleDisassembler, 0, cookie);
}
// Parse: "00000000`77606060 cc int 3"
void CdbEngine::handleDisassembler(const CdbBuiltinCommandPtr &command)
{
- QTC_ASSERT(qVariantCanConvert<Debugger::Internal::DisassemblerViewAgent*>(command->cookie), return;)
- Debugger::Internal::DisassemblerViewAgent *agent = qvariant_cast<Debugger::Internal::DisassemblerViewAgent*>(command->cookie);
+ QTC_ASSERT(qVariantCanConvert<Debugger::Internal::DisassemblerAgent*>(command->cookie), return;)
+ Debugger::Internal::DisassemblerAgent *agent = qvariant_cast<Debugger::Internal::DisassemblerAgent*>(command->cookie);
DisassemblerLines disassemblerLines;
foreach(const QByteArray &line, command->reply)
disassemblerLines.appendLine(DisassemblerLine(QString::fromLatin1(line)));
agent->setContents(disassemblerLines);
}
-void CdbEngine::fetchMemory(Debugger::Internal::MemoryViewAgent *agent, QObject *editor, quint64 addr, quint64 length)
+void CdbEngine::fetchMemory(Debugger::Internal::MemoryAgent *agent, QObject *editor, quint64 addr, quint64 length)
{
QTC_ASSERT(m_accessible, return;)
if (debug)
diff --git a/src/plugins/debugger/cdb2/cdbengine2.h b/src/plugins/debugger/cdb2/cdbengine2.h
index 9b428e078b2b07addc502a2b8dab1da2c404a6b4..36d7ffff12b3bd3cb29eadb7f77f8413b44ee84a 100644
--- a/src/plugins/debugger/cdb2/cdbengine2.h
+++ b/src/plugins/debugger/cdb2/cdbengine2.h
@@ -41,7 +41,7 @@
namespace Debugger {
namespace Cdb {
-class DisassemblerViewAgent;
+class DisassemblerAgent;
struct CdbBuiltinCommand;
struct CdbExtensionCommand;
struct CdbOptions;
@@ -106,8 +106,8 @@ public:
virtual bool acceptsBreakpoint(BreakpointId id) const;
virtual void attemptBreakpointSynchronization();
- virtual void fetchDisassembler(Debugger::Internal::DisassemblerViewAgent *agent);
- virtual void fetchMemory(Debugger::Internal::MemoryViewAgent *, QObject *, quint64 addr, quint64 length);
+ virtual void fetchDisassembler(Debugger::Internal::DisassemblerAgent *agent);
+ virtual void fetchMemory(Debugger::Internal::MemoryAgent *, QObject *, quint64 addr, quint64 length);
virtual void reloadModules();
virtual void loadSymbols(const QString &moduleName);
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 56ede78f5563ed50c06a3741dac3c7dbeb1b55a1..630d46d85527993a70172284fa48cb1019ed7ca3 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -214,8 +214,8 @@ public:
m_threadsHandler(),
m_watchHandler(engine),
m_isSlaveEngine(false),
- m_disassemblerViewAgent(engine),
- m_memoryViewAgent(engine)
+ m_disassemblerAgent(engine),
+ m_memoryAgent(engine)
{
connect(&m_locationTimer, SIGNAL(timeout()), SLOT(doRemoveLocationMark()));
}
@@ -306,8 +306,8 @@ public:
QFutureInterface<void> m_progress;
bool m_isSlaveEngine;
- DisassemblerViewAgent m_disassemblerViewAgent;
- MemoryViewAgent m_memoryViewAgent;
+ DisassemblerAgent m_disassemblerAgent;
+ MemoryAgent m_memoryAgent;
QScopedPointer<TextEditor::BaseTextMark> m_locationMark;
QTimer m_locationTimer;
};
@@ -452,7 +452,7 @@ QAbstractItemModel *DebuggerEngine::sourceFilesModel() const
return model;
}
-void DebuggerEngine::fetchMemory(MemoryViewAgent *, QObject *,
+void DebuggerEngine::fetchMemory(MemoryAgent *, QObject *,
quint64 addr, quint64 length)
{
Q_UNUSED(addr);
@@ -532,7 +532,7 @@ void DebuggerEngine::breakByFunction(const QString &functionName)
void DebuggerEngine::resetLocation()
{
- d->m_disassemblerViewAgent.resetLocation();
+ d->m_disassemblerAgent.resetLocation();
d->removeLocationMark();
}
@@ -559,7 +559,7 @@ void DebuggerEngine::gotoLocation(const QString &file, int line, bool setMarker)
void DebuggerEngine::gotoLocation(const StackFrame &frame, bool setMarker)
{
if (debuggerCore()->boolSetting(OperateByInstruction) || !frame.isUsable())
- d->m_disassemblerViewAgent.setFrame(frame, true, setMarker);
+ d->m_disassemblerAgent.setFrame(frame, true, setMarker);
else
gotoLocation(frame.file, frame.line, setMarker);
}
@@ -1154,8 +1154,7 @@ void DebuggerEngine::setToolTipExpression
{
}
-void DebuggerEngine::updateWatchData
- (const Internal::WatchData &, const Internal::WatchUpdateFlags &)
+void DebuggerEngine::updateWatchData(const WatchData &, const WatchUpdateFlags &)
{
}
@@ -1163,7 +1162,7 @@ void DebuggerEngine::watchPoint(const QPoint &)
{
}
-void DebuggerEngine::fetchDisassembler(Internal::DisassemblerViewAgent *)
+void DebuggerEngine::fetchDisassembler(DisassemblerAgent *)
{
}
@@ -1292,7 +1291,7 @@ void DebuggerEngine::attemptBreakpointSynchronization()
}
if (done)
- d->m_disassemblerViewAgent.updateBreakpointMarkers();
+ d->m_disassemblerAgent.updateBreakpointMarkers();
}
void DebuggerEngine::insertBreakpoint(BreakpointId id)
@@ -1320,8 +1319,8 @@ void DebuggerEngine::selectThread(int)
{
}
-void DebuggerEngine::assignValueInDebugger
- (const Internal::WatchData *, const QString &, const QVariant &)
+void DebuggerEngine::assignValueInDebugger(const WatchData *,
+ const QString &, const QVariant &)
{
}
@@ -1383,7 +1382,7 @@ void DebuggerEngine::executeDebuggerCommand(const QString &)
{
}
-Internal::BreakHandler *DebuggerEngine::breakHandler() const
+BreakHandler *DebuggerEngine::breakHandler() const
{
return debuggerCore()->breakHandler();
}
@@ -1478,17 +1477,17 @@ bool DebuggerEngine::isCppBreakpoint(const BreakpointParameters &p)
void DebuggerEngine::openMemoryView(quint64 address)
{
- d->m_memoryViewAgent.createBinEditor(address);
+ d->m_memoryAgent.createBinEditor(address);
}
void DebuggerEngine::updateMemoryViews()
{
- d->m_memoryViewAgent.updateContents();
+ d->m_memoryAgent.updateContents();
}
void DebuggerEngine::openDisassemblerView(const StackFrame &frame)
{
- DisassemblerViewAgent *agent = new DisassemblerViewAgent(this);
+ DisassemblerAgent *agent = new DisassemblerAgent(this);
agent->setFrame(frame, true, false);
}
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 9306ad6a6c2e968e9d432bfdd7405fd29de94067..9e6963888de37a585f24296aed2577de4b5eeab3 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -122,8 +122,8 @@ DEBUGGER_EXPORT QDebug operator<<(QDebug str, DebuggerState state);
namespace Internal {
class DebuggerPluginPrivate;
-class DisassemblerViewAgent;
-class MemoryViewAgent;
+class DisassemblerAgent;
+class MemoryAgent;
class WatchData;
class BreakHandler;
class ModulesHandler;
@@ -164,11 +164,11 @@ public:
virtual void watchPoint(const QPoint &);
virtual void openMemoryView(quint64 addr);
- virtual void fetchMemory(Internal::MemoryViewAgent *, QObject *,
+ virtual void fetchMemory(Internal::MemoryAgent *, QObject *,
quint64 addr, quint64 length);
virtual void updateMemoryViews();
virtual void openDisassemblerView(const Internal::StackFrame &frame);
- virtual void fetchDisassembler(Internal::DisassemblerViewAgent *);
+ virtual void fetchDisassembler(Internal::DisassemblerAgent *);
virtual void activateFrame(int index);
virtual void reloadModules();
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 05818f5e3a9c6f89a0f7281ecf55acdccf95f8d8..7c9eb48ba5dd86f627df7506a17eefaa208f0ce2 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1789,7 +1789,7 @@ void DebuggerPluginPrivate::requestContextMenu(TextEditor::ITextEditor *editor,
.section('\n', lineNumber - 1, lineNumber - 1);
BreakpointResponse needle;
needle.type = BreakpointByAddress;
- needle.address = DisassemblerViewAgent::addressFromDisassemblyLine(line);
+ needle.address = DisassemblerAgent::addressFromDisassemblyLine(line);
address = needle.address;
needle.lineNumber = -1;
id = breakHandler()->findSimilarBreakpoint(needle);
@@ -1872,7 +1872,7 @@ void DebuggerPluginPrivate::toggleBreakpoint()
if (textEditor->property("DisassemblerView").toBool()) {
QString line = textEditor->contents()
.section('\n', lineNumber - 1, lineNumber - 1);
- quint64 address = DisassemblerViewAgent::addressFromDisassemblyLine(line);
+ quint64 address = DisassemblerAgent::addressFromDisassemblyLine(line);
toggleBreakpointByAddress(address);
} else if (lineNumber >= 0) {
toggleBreakpointByFileAndLine(textEditor->file()->fileName(), lineNumber);
@@ -1919,7 +1919,7 @@ void DebuggerPluginPrivate::requestMark(ITextEditor *editor, int lineNumber)
if (editor->property("DisassemblerView").toBool()) {
QString line = editor->contents()
.section('\n', lineNumber - 1, lineNumber - 1);
- quint64 address = DisassemblerViewAgent::addressFromDisassemblyLine(line);
+ quint64 address = DisassemblerAgent::addressFromDisassemblyLine(line);
toggleBreakpointByAddress(address);
} else if (editor->file()) {
toggleBreakpointByFileAndLine(editor->file()->fileName(), lineNumber);
diff --git a/src/plugins/debugger/disassembleragent.cpp b/src/plugins/debugger/disassembleragent.cpp
index c93e6d0f8473d11b9cba89d7cf1e7c0245cb27a3..1d7658260fb3799358793e9de57cb9a3445616a3 100644
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -59,7 +59,7 @@ namespace Internal {
///////////////////////////////////////////////////////////////////////
//
-// DisassemblerViewAgent
+// DisassemblerAgent
//
///////////////////////////////////////////////////////////////////////
@@ -91,11 +91,11 @@ private:
};
-class DisassemblerViewAgentPrivate
+class DisassemblerAgentPrivate
{
public:
- DisassemblerViewAgentPrivate();
- ~DisassemblerViewAgentPrivate();
+ DisassemblerAgentPrivate();
+ ~DisassemblerAgentPrivate();
void configureMimeType();
public:
@@ -111,7 +111,7 @@ public:
QString mimeType;
};
-DisassemblerViewAgentPrivate::DisassemblerViewAgentPrivate()
+DisassemblerAgentPrivate::DisassemblerAgentPrivate()
: editor(0),
tryMixed(true),
setMarker(true),
@@ -120,7 +120,7 @@ DisassemblerViewAgentPrivate::DisassemblerViewAgentPrivate()
{
}
-DisassemblerViewAgentPrivate::~DisassemblerViewAgentPrivate()
+DisassemblerAgentPrivate::~DisassemblerAgentPrivate()
{
if (editor) {
EditorManager *editorManager = EditorManager::instance();
@@ -131,31 +131,31 @@ DisassemblerViewAgentPrivate::~DisassemblerViewAgentPrivate()
}
/*!
- \class DisassemblerViewAgent
+ \class DisassemblerAgent
Objects from this class are created in response to user actions in
the Gui for showing disassembled memory from the inferior. After creation
it handles communication between the engine and the editor.
*/
-DisassemblerViewAgent::DisassemblerViewAgent(DebuggerEngine *engine)
- : QObject(0), d(new DisassemblerViewAgentPrivate)
+DisassemblerAgent::DisassemblerAgent(DebuggerEngine *engine)
+ : QObject(0), d(new DisassemblerAgentPrivate)
{
d->engine = engine;
}
-DisassemblerViewAgent::~DisassemblerViewAgent()
+DisassemblerAgent::~DisassemblerAgent()
{
delete d;
d = 0;
}
-void DisassemblerViewAgent::cleanup()
+void DisassemblerAgent::cleanup()
{
d->cache.clear();
}
-void DisassemblerViewAgent::resetLocation()
+void DisassemblerAgent::resetLocation()
{
if (!d->editor)
return;
@@ -167,12 +167,12 @@ QString frameKey(const StackFrame &frame)
return _("%1:%2:%3").arg(frame.function).arg(frame.file).arg(frame.from);
}
-const StackFrame &DisassemblerViewAgent::frame() const
+const StackFrame &DisassemblerAgent::frame() const
{
return d->frame;
}
-bool DisassemblerViewAgent::isMixed() const
+bool DisassemblerAgent::isMixed() const
{
return d->tryMixed
&& d->frame.line > 0
@@ -180,7 +180,7 @@ bool DisassemblerViewAgent::isMixed() const
&& d->frame.function != _("??");
}
-void DisassemblerViewAgent::setFrame(const StackFrame &frame,
+void DisassemblerAgent::setFrame(const StackFrame &frame,
bool tryMixed, bool setMarker)
{
d->frame = frame;
@@ -202,7 +202,7 @@ void DisassemblerViewAgent::setFrame(const StackFrame &frame,
d->engine->fetchDisassembler(this);
}
-void DisassemblerViewAgentPrivate::configureMimeType()
+void DisassemblerAgentPrivate::configureMimeType()
{
QTC_ASSERT(editor, return);
@@ -222,12 +222,12 @@ void DisassemblerViewAgentPrivate::configureMimeType()
qWarning("Assembler mimetype '%s' not found.", qPrintable(mimeType));
}
-QString DisassemblerViewAgent::mimeType() const
+QString DisassemblerAgent::mimeType() const
{
return d->mimeType;
}
-void DisassemblerViewAgent::setMimeType(const QString &mt)
+void DisassemblerAgent::setMimeType(const QString &mt)
{
if (mt == d->mimeType)
return;
@@ -236,7 +236,7 @@ void DisassemblerViewAgent::setMimeType(const QString &mt)
d->configureMimeType();
}
-void DisassemblerViewAgent::setContents(const DisassemblerLines &contents)
+void DisassemblerAgent::setContents(const DisassemblerLines &contents)
{
QTC_ASSERT(d, return);
using namespace Core;
@@ -287,7 +287,7 @@ void DisassemblerViewAgent::setContents(const DisassemblerLines &contents)
updateLocationMarker();
}
-void DisassemblerViewAgent::updateLocationMarker()
+void DisassemblerAgent::updateLocationMarker()
{
QTC_ASSERT(d->editor, return);
@@ -309,7 +309,7 @@ void DisassemblerViewAgent::updateLocationMarker()
plainTextEdit->setTextCursor(tc);
}
-void DisassemblerViewAgent::updateBreakpointMarkers()
+void DisassemblerAgent::updateBreakpointMarkers()
{
if (!d->editor)
return;
@@ -337,13 +337,13 @@ void DisassemblerViewAgent::updateBreakpointMarkers()
}
}
-quint64 DisassemblerViewAgent::address() const
+quint64 DisassemblerAgent::address() const
{
return d->frame.address;
}
// Return address of an assembly line "0x0dfd bla"
-quint64 DisassemblerViewAgent::addressFromDisassemblyLine(const QString &line)
+quint64 DisassemblerAgent::addressFromDisassemblyLine(const QString &line)
{
return DisassemblerLine(line).address;
}
diff --git a/src/plugins/debugger/disassembleragent.h b/src/plugins/debugger/disassembleragent.h
index 4fb6879fc87338022b7cae55a74a21d084ac266f..90f10bd2ffc05b142a648697d419a47345ed8736 100644
--- a/src/plugins/debugger/disassembleragent.h
+++ b/src/plugins/debugger/disassembleragent.h
@@ -46,17 +46,17 @@ class DebuggerEngine;
namespace Internal {
class StackFrame;
-class DisassemblerViewAgent;
-class DisassemblerViewAgentPrivate;
+class DisassemblerAgent;
+class DisassemblerAgentPrivate;
-class DisassemblerViewAgent : public QObject
+class DisassemblerAgent : public QObject
{
Q_OBJECT
Q_PROPERTY(QString mimeType READ mimeType WRITE setMimeType)
public:
// Called from Gui
- explicit DisassemblerViewAgent(DebuggerEngine *engine);
- ~DisassemblerViewAgent();
+ explicit DisassemblerAgent(DebuggerEngine *engine);
+ ~DisassemblerAgent();
void setFrame(const StackFrame &frame, bool tryMixed, bool setMarker);
const StackFrame &frame() const;
@@ -78,7 +78,7 @@ public:
static quint64 addressFromDisassemblyLine(const QString &data);
private:
- DisassemblerViewAgentPrivate *d;
+ DisassemblerAgentPrivate *d;
};
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index bdfc23c078c1d4d06a49a1ad09c52760dbd8be19..a252132c6563ed9daba1487257e7576d32d1a2a6 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -3661,15 +3661,15 @@ void GdbEngine::handleWatchPoint(const GdbResponse &response)
struct MemoryAgentCookie
{
MemoryAgentCookie() : agent(0), token(0), address(0) {}
- MemoryAgentCookie(MemoryViewAgent *agent_, QObject *token_, quint64 address_)
+ MemoryAgentCookie(MemoryAgent *agent_, QObject *token_, quint64 address_)
: agent(agent_), token(token_), address(address_)
{}
- QPointer<MemoryViewAgent> agent;
+ QPointer<MemoryAgent> agent;
QPointer<QObject> token;
quint64 address;
};
-void GdbEngine::fetchMemory(MemoryViewAgent *agent, QObject *token, quint64 addr,
+void GdbEngine::fetchMemory(MemoryAgent *agent, QObject *token, quint64 addr,
quint64 length)
{
//qDebug() << "GDB MEMORY FETCH" << agent << addr << length;
@@ -3708,17 +3708,17 @@ class DisassemblerAgentCookie
{
public:
DisassemblerAgentCookie() : agent(0), attempts(0) {}
- DisassemblerAgentCookie(DisassemblerViewAgent *agent_)
+ DisassemblerAgentCookie(DisassemblerAgent *agent_)
: agent(agent_), attempts(0)
{}
public:
- QPointer<DisassemblerViewAgent> agent;
+ QPointer<DisassemblerAgent> agent;
int attempts;
};
// FIXME: add agent->frame() accessor and use that
-void GdbEngine::fetchDisassembler(DisassemblerViewAgent *agent)
+void GdbEngine::fetchDisassembler(DisassemblerAgent *agent)
{
fetchDisassemblerByCli(agent, agent->isMixed());
/*
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index a3eabba00a0974eeeb0b0995d76776fe70c4bec0..1b095e998ea38963dc795933553ab466263055dc 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -397,7 +397,7 @@ private: ////////// View & Data Stuff //////////
//
// Disassembler specific stuff
//
- void fetchDisassembler(DisassemblerViewAgent *agent);
+ void fetchDisassembler(DisassemblerAgent *agent);
void fetchDisassemblerByAddress(const DisassemblerAgentCookie &ac,
bool useMixedMode);
void fetchDisassemblerByCli(const DisassemblerAgentCookie &ac,
@@ -455,7 +455,7 @@ private: ////////// View & Data Stuff //////////
virtual void assignValueInDebugger(const WatchData *data,
const QString &expr, const QVariant &value);
- virtual void fetchMemory(MemoryViewAgent *agent, QObject *token,
+ virtual void fetchMemory(MemoryAgent *agent, QObject *token,
quint64 addr, quint64 length);
void handleFetchMemory(const GdbResponse &response);
diff --git a/src/plugins/debugger/lldb/ipcenginehost.cpp b/src/plugins/debugger/lldb/ipcenginehost.cpp
index f3258f342f424eb6b23179ba5a347544b54232c8..bb6f9b180d6132991c96c8812ba3eb2f802e6e68 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.cpp
+++ b/src/plugins/debugger/lldb/ipcenginehost.cpp
@@ -234,7 +234,7 @@ void IPCEngineHost::selectThread(int index)
rpcCall(SelectThread, p);
}
-void IPCEngineHost::fetchDisassembler(DisassemblerViewAgent *v)
+void IPCEngineHost::fetchDisassembler(DisassemblerAgent *v)
{
quint64 address = v->frame().address;
m_frameToDisassemblerAgent.insert(address, v);
@@ -468,7 +468,7 @@ void IPCEngineHost::rpcCallback(quint64 f, QByteArray payload)
DisassemblerLines lines;
s >> pc;
s >> lines;
- DisassemblerViewAgent *view = m_frameToDisassemblerAgent.take(pc);
+ DisassemblerAgent *view = m_frameToDisassemblerAgent.take(pc);
if (view)
view->setContents(lines);
}
diff --git a/src/plugins/debugger/lldb/ipcenginehost.h b/src/plugins/debugger/lldb/ipcenginehost.h
index 8866ded2615acf4280880aea95e52833a0ce1dc7..b36840641cf15bb3b77624d444c6ec93dc9ecce9 100644
--- a/src/plugins/debugger/lldb/ipcenginehost.h
+++ b/src/plugins/debugger/lldb/ipcenginehost.h
@@ -105,7 +105,7 @@ public:
void executeJumpToLine(const QString &fileName, int lineNumber);
void activateFrame(int index);
void selectThread(int index);
- void fetchDisassembler(DisassemblerViewAgent *);
+ void fetchDisassembler(DisassemblerAgent *);
bool acceptsBreakpoint(BreakpointId) const { return true; } // FIXME
void insertBreakpoint(BreakpointId id);
void removeBreakpoint(BreakpointId id);
@@ -129,7 +129,7 @@ private:
quint64 m_nextMessagePayloadSize;
quint64 m_cookie;
QIODevice *m_device;
- QHash<quint64, DisassemblerViewAgent *> m_frameToDisassemblerAgent;
+ QHash<quint64, DisassemblerAgent *> m_frameToDisassemblerAgent;
QHash<QString, SourceAgent *> m_sourceAgents;
};
diff --git a/src/plugins/debugger/memoryagent.cpp b/src/plugins/debugger/memoryagent.cpp
index 45897ef5e13da1d2853f2df60735d6fcdbe4b70a..57ea85218aba0b0b7005e9ea74f9762ecf2b6113 100644
--- a/src/plugins/debugger/memoryagent.cpp
+++ b/src/plugins/debugger/memoryagent.cpp
@@ -48,12 +48,12 @@ namespace Internal {
///////////////////////////////////////////////////////////////////////
//
-// MemoryViewAgent
+// MemoryAgent
//
///////////////////////////////////////////////////////////////////////
/*!
- \class MemoryViewAgent
+ \class MemoryAgent
Objects form this class are created in response to user actions in
the Gui for showing raw memory from the inferior. After creation
@@ -62,13 +62,13 @@ namespace Internal {
namespace { const int DataRange = 1024 * 1024; }
-MemoryViewAgent::MemoryViewAgent(Debugger::DebuggerEngine *engine)
+MemoryAgent::MemoryAgent(Debugger::DebuggerEngine *engine)
: QObject(engine), m_engine(engine)
{
QTC_ASSERT(engine, /**/);
}
-MemoryViewAgent::~MemoryViewAgent()
+MemoryAgent::~MemoryAgent()
{
QList<IEditor *> editors;
foreach (QPointer<IEditor> editor, m_editors)
@@ -77,7 +77,7 @@ MemoryViewAgent::~MemoryViewAgent()
EditorManager::instance()->closeEditors(editors);
}
-void MemoryViewAgent::createBinEditor(quint64 addr)
+void MemoryAgent::createBinEditor(quint64 addr)
{
EditorManager *editorManager = EditorManager::instance();
QString titlePattern = tr("Memory $");
@@ -115,13 +115,13 @@ void MemoryViewAgent::createBinEditor(quint64 addr)
}
}
-void MemoryViewAgent::fetchLazyData(IEditor *editor, quint64 block, bool sync)
+void MemoryAgent::fetchLazyData(IEditor *editor, quint64 block, bool sync)
{
Q_UNUSED(sync); // FIXME: needed support for incremental searching
m_engine->fetchMemory(this, editor, BinBlockSize * block, BinBlockSize);
}
-void MemoryViewAgent::addLazyData(QObject *editorToken, quint64 addr,
+void MemoryAgent::addLazyData(QObject *editorToken, quint64 addr,
const QByteArray &ba)
{
IEditor *editor = qobject_cast<IEditor *>(editorToken);
@@ -132,7 +132,7 @@ void MemoryViewAgent::addLazyData(QObject *editorToken, quint64 addr,
}
}
-void MemoryViewAgent::provideNewRange(IEditor *editor, quint64 address)
+void MemoryAgent::provideNewRange(IEditor *editor, quint64 address)
{
QMetaObject::invokeMethod(editor->widget(), "setLazyData",
Q_ARG(quint64, address), Q_ARG(int, DataRange),
@@ -142,19 +142,19 @@ void MemoryViewAgent::provideNewRange(IEditor *editor, quint64 address)
// Since we are not dealing with files, we take these signals to mean
// "move to start/end of range". This seems to make more sense than
// jumping to the start or end of the address space, respectively.
-void MemoryViewAgent::handleStartOfFileRequested(IEditor *editor)
+void MemoryAgent::handleStartOfFileRequested(IEditor *editor)
{
QMetaObject::invokeMethod(editor->widget(),
"setCursorPosition", Q_ARG(int, 0));
}
-void MemoryViewAgent::handleEndOfFileRequested(IEditor *editor)
+void MemoryAgent::handleEndOfFileRequested(IEditor *editor)
{
QMetaObject::invokeMethod(editor->widget(),
"setCursorPosition", Q_ARG(int, DataRange - 1));
}
-void MemoryViewAgent::updateContents()
+void MemoryAgent::updateContents()
{
foreach (QPointer<IEditor> editor, m_editors)
if (editor)
diff --git a/src/plugins/debugger/memoryagent.h b/src/plugins/debugger/memoryagent.h
index d7c8b01bf9c60858265bbc49ba8f7958f0002a8b..23917793c9f35f8aa287bbc21713c277fbfa9049 100644
--- a/src/plugins/debugger/memoryagent.h
+++ b/src/plugins/debugger/memoryagent.h
@@ -43,13 +43,13 @@ class DebuggerEngine;
namespace Internal {
-class MemoryViewAgent : public QObject
+class MemoryAgent : public QObject
{
Q_OBJECT
public:
- explicit MemoryViewAgent(DebuggerEngine *engine);
- ~MemoryViewAgent();
+ explicit MemoryAgent(DebuggerEngine *engine);
+ ~MemoryAgent();
enum { BinBlockSize = 1024 };
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index ee6fedc9b24bdb6fa3aa00ee82b9602cd71df05c..0b8f53b2ea75551c4e89dcc9a5c62d31d0446306 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -146,15 +146,15 @@ void QmlCppEngine::watchPoint(const QPoint &point)
d->m_cppEngine->watchPoint(point);
}
-void QmlCppEngine::fetchMemory(MemoryViewAgent *mva, QObject *obj,
+void QmlCppEngine::fetchMemory(MemoryAgent *ma, QObject *obj,
quint64 addr, quint64 length)
{
- d->m_cppEngine->fetchMemory(mva, obj, addr, length);
+ d->m_cppEngine->fetchMemory(ma, obj, addr, length);
}
-void QmlCppEngine::fetchDisassembler(DisassemblerViewAgent *dva)
+void QmlCppEngine::fetchDisassembler(DisassemblerAgent *da)
{
- d->m_cppEngine->fetchDisassembler(dva);
+ d->m_cppEngine->fetchDisassembler(da);
}
void QmlCppEngine::activateFrame(int index)
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index 46b5a6c391cb785ebec9c25c1a34fc989513c320..0e554aa295578ea45356403e28cf9fb9fc8d511f 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -30,9 +30,9 @@ public:
const WatchUpdateFlags &flags);
virtual void watchPoint(const QPoint &);
- virtual void fetchMemory(MemoryViewAgent *, QObject *,
+ virtual void fetchMemory(MemoryAgent *, QObject *,
quint64 addr, quint64 length);
- virtual void fetchDisassembler(DisassemblerViewAgent *);
+ virtual void fetchDisassembler(DisassemblerAgent *);
virtual void activateFrame(int index);
virtual void reloadModules();