From 01aabbda82ed0b7d57846a9af33e7b637e032b3d Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Mon, 10 May 2010 10:33:52 +0200
Subject: [PATCH] debugger: rename some breakpoint related functions
---
src/plugins/debugger/breakhandler.cpp | 4 ++--
src/plugins/debugger/breakhandler.h | 4 ++--
src/plugins/debugger/breakwindow.cpp | 3 ++-
src/plugins/debugger/gdb/gdbengine.cpp | 22 +++++++++++-----------
src/plugins/debugger/gdb/gdbengine.h | 2 +-
5 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 8db1e38dc1b..09793d91ce2 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -357,7 +357,7 @@ void BreakHandler::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.
for (int index = 0; index != size(); ++index) {
@@ -389,7 +389,7 @@ int BreakHandler::findBreakpoint(const QString &fileName, int lineNumber) const
return -1;
}
-BreakpointData *BreakHandler::findBreakpoint(int bpNumber) const
+BreakpointData *BreakHandler::findBreakpointByNumber(int bpNumber) const
{
if (!size())
return 0;
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index c773fdd2001..b1824f51ba1 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -69,8 +69,8 @@ public:
int indexOf(BreakpointData *data) { return m_bp.indexOf(data); }
// If lineNumber < 0, interpret fileName as address.
int findBreakpoint(const QString &fileName, int lineNumber) const;
- int findBreakpoint(const BreakpointData &data) const; // Returns index.
- BreakpointData *findBreakpoint(int bpNumber) const;
+ int findSimilarBreakpoint(const BreakpointData &data) const; // Returns index.
+ BreakpointData *findBreakpointByNumber(int bpNumber) const;
void updateMarkers();
QList<BreakpointData *> insertedBreakpoints() const;
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index c92f33ac00a..37f5ced885e 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -137,8 +137,9 @@ void BreakWindow::resizeEvent(QResizeEvent *ev)
void BreakWindow::mouseDoubleClickEvent(QMouseEvent *ev)
{
QModelIndex indexUnderMouse = indexAt(ev->pos());
- if (indexUnderMouse.isValid())
+ if (indexUnderMouse.isValid() && indexUnderMouse.column() >= 4)
editBreakpoint(QModelIndexList() << indexUnderMouse);
+ QTreeView::mouseDoubleClickEvent(ev);
}
void BreakWindow::contextMenuEvent(QContextMenuEvent *ev)
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1f08b616052..cd6865dc981 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -492,8 +492,8 @@ void GdbEngine::handleResponse(const QByteArray &buff)
const GdbMi bkpt = result.findChild("bkpt");
const int number = bkpt.findChild("number").data().toInt();
BreakHandler *handler = manager()->breakHandler();
- BreakpointData *data = handler->findBreakpoint(number);
- breakpointDataFromOutput(data, bkpt);
+ BreakpointData *data = handler->findBreakpointByNumber(number);
+ setBreakpointDataFromOutput(data, bkpt);
handler->updateMarkers();
} else {
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())
return;
@@ -2241,7 +2241,7 @@ void GdbEngine::handleBreakInsert1(const GdbResponse &response)
if (response.resultClass == GdbResultDone) {
// Interesting only on Mac?
GdbMi bkpt = response.data.findChild("bkpt");
- breakpointDataFromOutput(data, bkpt);
+ setBreakpointDataFromOutput(data, bkpt);
} else {
// 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
@@ -2313,10 +2313,10 @@ void GdbEngine::handleBreakList(const GdbMi &table)
BreakHandler *handler = manager()->breakHandler();
for (int index = 0; index != bkpts.size(); ++index) {
BreakpointData temp;
- breakpointDataFromOutput(&temp, bkpts.at(index));
- int found = handler->findBreakpoint(temp);
+ setBreakpointDataFromOutput(&temp, bkpts.at(index));
+ int found = handler->findSimilarBreakpoint(temp);
if (found != -1)
- breakpointDataFromOutput(handler->at(found), bkpts.at(index));
+ setBreakpointDataFromOutput(handler->at(found), bkpts.at(index));
//else
//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
BreakHandler *handler = manager()->breakHandler();
- BreakpointData *data = handler->findBreakpoint(bpNumber);
+ BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (response.resultClass == GdbResultDone && data) {
QString msg = _(response.data.findChild("consolestreamoutput").data());
//if (msg.contains(__("Will stop next time breakpoint"))) {
@@ -2364,7 +2364,7 @@ void GdbEngine::handleBreakCondition(const GdbResponse &response)
{
int bpNumber = response.cookie.toInt();
BreakHandler *handler = manager()->breakHandler();
- BreakpointData *data = handler->findBreakpoint(bpNumber);
+ BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (response.resultClass == GdbResultDone) {
// We just assume it was successful. Otherwise we had to parse
// the output stream data.
@@ -2447,7 +2447,7 @@ void GdbEngine::handleBreakInfo(const GdbResponse &response)
// constructor.
const int bpNumber = response.cookie.toInt();
const BreakHandler *handler = manager()->breakHandler();
- BreakpointData *data = handler->findBreakpoint(bpNumber);
+ BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (data) {
QString str = QString::fromLocal8Bit(
response.data.findChild("consolestreamoutput").data());
@@ -2464,7 +2464,7 @@ void GdbEngine::handleInfoLine(const GdbResponse &response)
// <_Z10testQStackv+142>.\n"
const int bpNumber = response.cookie.toInt();
const BreakHandler *handler = manager()->breakHandler();
- BreakpointData *data = handler->findBreakpoint(bpNumber);
+ BreakpointData *data = handler->findBreakpointByNumber(bpNumber);
if (!data)
return;
QByteArray ba = response.data.findChild("consolestreamoutput").data();
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index 553d2833c5f..372ff4d1318 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -347,7 +347,7 @@ private: ////////// View & Data Stuff //////////
void handleWatchInsert(const GdbResponse &response);
void handleInfoLine(const GdbResponse &response);
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);
void sendInsertBreakpoint(int index);
QString breakLocation(const QString &file) const;
--
GitLab