From d7a75dff9e45b98563964a9cdc7447fcfa67be41 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Tue, 16 Nov 2010 11:55:48 +0100
Subject: [PATCH] debugger: breakpoint code cosmetics
---
src/plugins/debugger/breakhandler.cpp | 8 +++---
src/plugins/debugger/breakpoint.cpp | 36 ++++++++++++++++----------
src/plugins/debugger/breakpoint.h | 2 +-
src/plugins/debugger/gdb/gdbengine.cpp | 2 +-
4 files changed, 29 insertions(+), 19 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index 14b0dd39a04..c1af29fc34d 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -439,10 +439,10 @@ QVariant BreakHandler::data(const QModelIndex &mi, int role) const
data.isWatchpoint() ? data.address : response.address;
if (address)
displayValue += QString::fromAscii("0x%1").arg(address, 0, 16);
- if (!response.state.isEmpty()) {
+ if (!response.extra.isEmpty()) {
if (!displayValue.isEmpty())
displayValue += QLatin1Char(' ');
- displayValue += QString::fromAscii(response.state);
+ displayValue += QString::fromAscii(response.extra);
}
return displayValue;
}
@@ -960,8 +960,8 @@ QString BreakHandler::BreakpointItem::toToolTip() const
<< "</td><td>" << response.number << "</td></tr>"
<< "<tr><td>" << tr("Breakpoint Type:")
<< "</td><td>" << t << "</td></tr>"
- << "<tr><td>" << tr("State:")
- << "</td><td>" << response.state << "</td></tr>"
+ << "<tr><td>" << tr("Extra Information:")
+ << "</td><td>" << response.extra << "</td></tr>"
<< "</table><br><hr><table>"
<< "<tr><th>" << tr("Property")
<< "</th><th>" << tr("Requested")
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index 13de212d51e..b14ffc5158f 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -44,23 +44,22 @@ namespace Internal {
BreakpointParameters::BreakpointParameters(BreakpointType t)
: type(t), enabled(true), useFullPath(false),
ignoreCount(0), lineNumber(0), address(0)
-{
-}
+{}
bool BreakpointParameters::equals(const BreakpointParameters &rhs) const
{
- return type == rhs.type && enabled == rhs.enabled
- && useFullPath == rhs.useFullPath
- && fileName == rhs.fileName && condition == rhs.condition
- && ignoreCount == rhs.ignoreCount && lineNumber == rhs.lineNumber
- && address == rhs.address && threadSpec == rhs.threadSpec
- && functionName == rhs.functionName;
+ return type == rhs.type
+ && enabled == rhs.enabled
+ && useFullPath == rhs.useFullPath
+ && fileName == rhs.fileName
+ && condition == rhs.condition
+ && ignoreCount == rhs.ignoreCount
+ && lineNumber == rhs.lineNumber
+ && address == rhs.address
+ && threadSpec == rhs.threadSpec
+ && functionName == rhs.functionName;
}
-BreakpointResponse::BreakpointResponse()
- : number(0), multiple(false)
-{}
-
bool BreakpointParameters::conditionsMatch(const QByteArray &other) const
{
// Some versions of gdb "beautify" the passed condition.
@@ -85,6 +84,17 @@ QString BreakpointParameters::toString() const
return result;
}
+
+//////////////////////////////////////////////////////////////////
+//
+// BreakpointParameters
+//
+//////////////////////////////////////////////////////////////////
+
+BreakpointResponse::BreakpointResponse()
+ : number(0), multiple(false)
+{}
+
QString BreakpointResponse::toString() const
{
QString result;
@@ -107,7 +117,7 @@ void BreakpointResponse::fromParameters(const BreakpointParameters &p)
number = 0;
fullName.clear();
multiple = false;
- state.clear();
+ extra.clear();
}
} // namespace Internal
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index b475177093e..71a6566ddc3 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -112,7 +112,7 @@ public:
int number; // Breakpoint number assigned by the debugger engine.
QString fullName; // Full file name acknowledged by the debugger engine.
bool multiple; // Happens in constructors/gdb.
- QByteArray state; // gdb: <PENDING>, <MULTIPLE>
+ QByteArray extra; // gdb: <PENDING>, <MULTIPLE>
};
typedef QList<BreakpointId> BreakpointIds;
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 5b071cea557..b59d5716da0 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2074,7 +2074,7 @@ void GdbEngine::setBreakpointDataFromOutput(BreakpointId id, const GdbMi &bkpt)
if (child.data().startsWith("0x")) {
response.address = child.data().mid(2).toULongLong(0, 16);
} else {
- response.state = child.data();
+ response.extra = child.data();
if (child.data() == "<MULTIPLE>")
response.multiple = true;
}
--
GitLab