From 5209b396cd7a7901e2abe7e8cbe1a1fb98483a57 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Thu, 18 Nov 2010 17:44:04 +0100
Subject: [PATCH] debugger: make BreakHandler::setState private
---
src/plugins/debugger/breakhandler.h | 9 +--------
src/plugins/debugger/breakpointmarker.h | 1 +
src/plugins/debugger/cdb/cdbengine.cpp | 4 ++--
src/plugins/debugger/cdb2/cdbengine2.cpp | 6 +++---
4 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/plugins/debugger/breakhandler.h b/src/plugins/debugger/breakhandler.h
index 38d57053443..e3773fc22ac 100644
--- a/src/plugins/debugger/breakhandler.h
+++ b/src/plugins/debugger/breakhandler.h
@@ -143,13 +143,6 @@ public:
const BreakpointParameters &data);
private:
-public:
- // FIXME: Make private.
- void setState(BreakpointId id, BreakpointState state);
-
-private:
- friend class BreakpointMarker;
-
// QAbstractItemModel implementation.
int columnCount(const QModelIndex &parent) const;
int rowCount(const QModelIndex &parent) const;
@@ -157,7 +150,7 @@ private:
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
Qt::ItemFlags flags(const QModelIndex &index) const;
- void markerUpdated(BreakpointMarker *marker, int lineNumber);
+ void setState(BreakpointId id, BreakpointState state);
void loadBreakpoints();
void saveBreakpoints();
void updateMarker(BreakpointId id);
diff --git a/src/plugins/debugger/breakpointmarker.h b/src/plugins/debugger/breakpointmarker.h
index 2e8bd325aaa..9445aec87c3 100644
--- a/src/plugins/debugger/breakpointmarker.h
+++ b/src/plugins/debugger/breakpointmarker.h
@@ -58,4 +58,5 @@ private:
} // namespace Internal
} // namespace Debugger
+
#endif
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index b8e15eaed16..08341eb5309 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1294,7 +1294,7 @@ bool CdbEngine::attemptBreakpointSynchronizationI(QString *errorMessage)
errorMessage->clear();
switch (handler->state(id)) {
case BreakpointInsertRequested:
- handler->setState(id, BreakpointInsertProceeding);
+ handler->notifyBreakpointInsertProceeding(id);
if (addCdbBreakpoint(control, symbols, data, &response, errorMessage)) {
handler->notifyBreakpointInsertOk(id);
handler->setResponse(id, response);
@@ -1305,7 +1305,7 @@ bool CdbEngine::attemptBreakpointSynchronizationI(QString *errorMessage)
break;
case BreakpointChangeRequested:
// Skip disabled breakpoints, else add.
- handler->setState(id, BreakpointChangeProceeding);
+ handler->notifyBreakpointChangeProceeding(id);
if (data.enabled) {
if (addCdbBreakpoint(control, symbols, data, &response, errorMessage)) {
handler->notifyBreakpointChangeOk(id);
diff --git a/src/plugins/debugger/cdb2/cdbengine2.cpp b/src/plugins/debugger/cdb2/cdbengine2.cpp
index 58f143d7d5a..32ab4085e2d 100644
--- a/src/plugins/debugger/cdb2/cdbengine2.cpp
+++ b/src/plugins/debugger/cdb2/cdbengine2.cpp
@@ -1606,13 +1606,13 @@ void CdbEngine::attemptBreakpointSynchronization()
case BreakpointInsertRequested:
response.number = m_nextBreakpointNumber++;
postCommand(cdbAddBreakpointCommand(p, false, response.number), 0);
- handler->setState(id, BreakpointInsertProceeding);
+ handler->notifyBreakpointInsertProceeding(id);
handler->notifyBreakpointInsertOk(id);
handler->setResponse(id, response);
break;
case BreakpointChangeRequested:
- // Skip disabled breakpoints, else add
- handler->setState(id, BreakpointChangeProceeding);
+ // Skip disabled breakpoints, else add.
+ handler->notifyBreakpointChangeProceeding(id);
if (p.enabled) {
response.number = m_nextBreakpointNumber++;
postCommand(cdbAddBreakpointCommand(p, false, response.number), 0);
--
GitLab