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

debugger: rename some breakpoint related functions

Browse Source
This commit is contained in:
hjk
2010-05-10 10:33:52 +02:00
parent 6d0b571aa5
commit 01aabbda82
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/breakhandler.cpp
View File

@@ -357,7 +357,7 @@ void BreakHandler::clear()
m_inserted.clear(); m_inserted.clear();
} }
int BreakHandler::findBreakpoint(const BreakpointData &needle) const int BreakHandler::findSimilarBreakpoint(const BreakpointData &needle) const
{ {
// Search a breakpoint we might refer to. // Search a breakpoint we might refer to.
for (int index = 0; index != size(); ++index) { for (int index = 0; index != size(); ++index) {
@@ -389,7 +389,7 @@ int BreakHandler::findBreakpoint(const QString &fileName, int lineNumber) const
return -1; return -1;
} }
BreakpointData *BreakHandler::findBreakpoint(int bpNumber) const BreakpointData *BreakHandler::findBreakpointByNumber(int bpNumber) const
{ {
if (!size()) if (!size())
return 0; return 0;

4
src/plugins/debugger/breakhandler.h
View File

@@ -69,8 +69,8 @@ public:
int indexOf(BreakpointData *data) { return m_bp.indexOf(data); } int indexOf(BreakpointData *data) { return m_bp.indexOf(data); }
// If lineNumber < 0, interpret fileName as address. // If lineNumber < 0, interpret fileName as address.
int findBreakpoint(const QString &fileName, int lineNumber) const; int findBreakpoint(const QString &fileName, int lineNumber) const;
int findBreakpoint(const BreakpointData &data) const; // Returns index. int findSimilarBreakpoint(const BreakpointData &data) const; // Returns index.
BreakpointData *findBreakpoint(int bpNumber) const; BreakpointData *findBreakpointByNumber(int bpNumber) const;
void updateMarkers(); void updateMarkers();
QList<BreakpointData *> insertedBreakpoints() const; QList<BreakpointData *> insertedBreakpoints() const;

3
src/plugins/debugger/breakwindow.cpp
View File

@@ -137,8 +137,9 @@ void BreakWindow::resizeEvent(QResizeEvent *ev)
void BreakWindow::mouseDoubleClickEvent(QMouseEvent *ev) void BreakWindow::mouseDoubleClickEvent(QMouseEvent *ev)
{ {
QModelIndex indexUnderMouse = indexAt(ev->pos()); QModelIndex indexUnderMouse = indexAt(ev->pos());
if (indexUnderMouse.isValid()) if (indexUnderMouse.isValid() && indexUnderMouse.column() >= 4)
editBreakpoint(QModelIndexList() << indexUnderMouse); editBreakpoint(QModelIndexList() << indexUnderMouse);
QTreeView::mouseDoubleClickEvent(ev);
} }
void BreakWindow::contextMenuEvent(QContextMenuEvent *ev) void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)

22
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -492,8 +492,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
const GdbMi bkpt = result.findChild("bkpt"); const GdbMi bkpt = result.findChild("bkpt");
const int number = bkpt.findChild("number").data().toInt(); const int number = bkpt.findChild("number").data().toInt();
BreakHandler *handler = manager()->breakHandler(); BreakHandler *handler = manager()->breakHandler();
BreakpointData *data = handler->findBreakpoint(number); BreakpointData *data = handler->findBreakpointByNumber(number);
breakpointDataFromOutput(data, bkpt); setBreakpointDataFromOutput(data, bkpt);
handler->updateMarkers(); handler->updateMarkers();
} else { } else {
qDebug() << "IGNORED ASYNC OUTPUT" qDebug() << "IGNORED ASYNC OUTPUT"
@@ -2088,7 +2088,7 @@ void GdbEngine::setTokenBarrier()
// //
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
void GdbEngine::breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt) void GdbEngine::setBreakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt)
{ {
if (!bkpt.isValid()) if (!bkpt.isValid())
return; return;
@@ -2241,7 +2241,7 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response)
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
// Interesting only on Mac? // Interesting only on Mac?
GdbMi bkpt = response.data.findChild("bkpt"); GdbMi bkpt = response.data.findChild("bkpt");
breakpointDataFromOutput(data, bkpt); setBreakpointDataFromOutput(data, bkpt);
} else { } else {
// Some versions of gdb like "GNU gdb (GDB) SUSE (6.8.91.20090930-2.4)" // Some versions of gdb like "GNU gdb (GDB) SUSE (6.8.91.20090930-2.4)"
// know how to do pending breakpoints using CLI but not MI. So try // know how to do pending breakpoints using CLI but not MI. So try
@@ -2313,10 +2313,10 @@ void GdbEngine::handleBreakList(const GdbMi &table)
BreakHandler *handler = manager()->breakHandler(); BreakHandler *handler = manager()->breakHandler();
for (int index = 0; index != bkpts.size(); ++index) { for (int index = 0; index != bkpts.size(); ++index) {
BreakpointData temp; BreakpointData temp;
breakpointDataFromOutput(&temp, bkpts.at(index)); setBreakpointDataFromOutput(&temp, bkpts.at(index));
int found = handler->findBreakpoint(temp); int found = handler->findSimilarBreakpoint(temp);
if (found != -1) if (found != -1)
breakpointDataFromOutput(handler->at(found), bkpts.at(index)); setBreakpointDataFromOutput(handler->at(found), bkpts.at(index));
//else //else
//qDebug() << "CANNOT HANDLE RESPONSE" << bkpts.at(index).toString(); //qDebug() << "CANNOT HANDLE RESPONSE" << bkpts.at(index).toString();
} }
@@ -2346,7 +2346,7 @@ void GdbEngine::handleBreakIgnore(const GdbResponse &response)
// //
// gdb 6.3 does not produce any console output // gdb 6.3 does not produce any console output
BreakHandler *handler = manager()->breakHandler(); BreakHandler *handler = manager()->breakHandler();
BreakpointData *data = handler->findBreakpoint(bpNumber); BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (response.resultClass == GdbResultDone && data) { if (response.resultClass == GdbResultDone && data) {
QString msg = _(response.data.findChild("consolestreamoutput").data()); QString msg = _(response.data.findChild("consolestreamoutput").data());
//if (msg.contains(__("Will stop next time breakpoint"))) { //if (msg.contains(__("Will stop next time breakpoint"))) {
@@ -2364,7 +2364,7 @@ void GdbEngine::handleBreakCondition(const GdbResponse &response)
{ {
int bpNumber = response.cookie.toInt(); int bpNumber = response.cookie.toInt();
BreakHandler *handler = manager()->breakHandler(); BreakHandler *handler = manager()->breakHandler();
BreakpointData *data = handler->findBreakpoint(bpNumber); BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (response.resultClass == GdbResultDone) { if (response.resultClass == GdbResultDone) {
// We just assume it was successful. Otherwise we had to parse // We just assume it was successful. Otherwise we had to parse
// the output stream data. // the output stream data.
@@ -2447,7 +2447,7 @@ void GdbEngine::handleBreakInfo(const GdbResponse &response)
// constructor. // constructor.
const int bpNumber = response.cookie.toInt(); const int bpNumber = response.cookie.toInt();
const BreakHandler *handler = manager()->breakHandler(); const BreakHandler *handler = manager()->breakHandler();
BreakpointData *data = handler->findBreakpoint(bpNumber); BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (data) { if (data) {
QString str = QString::fromLocal8Bit( QString str = QString::fromLocal8Bit(
response.data.findChild("consolestreamoutput").data()); response.data.findChild("consolestreamoutput").data());
@@ -2464,7 +2464,7 @@ void GdbEngine::handleInfoLine(const GdbResponse &response)
// <_Z10testQStackv+142>.\n" // <_Z10testQStackv+142>.\n"
const int bpNumber = response.cookie.toInt(); const int bpNumber = response.cookie.toInt();
const BreakHandler *handler = manager()->breakHandler(); const BreakHandler *handler = manager()->breakHandler();
BreakpointData *data = handler->findBreakpoint(bpNumber); BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (!data) if (!data)
return; return;
QByteArray ba = response.data.findChild("consolestreamoutput").data(); QByteArray ba = response.data.findChild("consolestreamoutput").data();

2
src/plugins/debugger/gdb/gdbengine.h
View File

@@ -347,7 +347,7 @@ private: ////////// View & Data Stuff //////////
void handleWatchInsert(const GdbResponse &response); void handleWatchInsert(const GdbResponse &response);
void handleInfoLine(const GdbResponse &response); void handleInfoLine(const GdbResponse &response);
void extractDataFromInfoBreak(const QString &output, BreakpointData *data); void extractDataFromInfoBreak(const QString &output, BreakpointData *data);
void breakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt); void setBreakpointDataFromOutput(BreakpointData *data, const GdbMi &bkpt);
QByteArray breakpointLocation(const BreakpointData *data); QByteArray breakpointLocation(const BreakpointData *data);
void sendInsertBreakpoint(int index); void sendInsertBreakpoint(int index);
QString breakLocation(const QString &file) const; QString breakLocation(const QString &file) const;