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

debugger: looks like the BreakpointData layer is going to be unneeded.

Browse Source
This commit is contained in:
hjk
2010-11-16 11:06:09 +01:00
parent 3cf3f14d7f
commit 694503cc76
6 changed files with 33 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -168,18 +168,12 @@ BreakpointId BreakHandler::findBreakpointByFileAndLine(const QString &fileName,
return BreakpointId(-1);
}
const BreakpointData *BreakHandler::breakpointById(BreakpointId id) const
const BreakpointParameters &BreakHandler::breakpointData(BreakpointId id) const
{
static BreakpointParameters dummy;
ConstIterator it = m_storage.find(id);
QTC_ASSERT(it != m_storage.end(), return 0);
return &it->data;
}
BreakpointData *BreakHandler::breakpointById(BreakpointId id)
{
Iterator it = m_storage.find(id);
QTC_ASSERT(it != m_storage.end(), return 0);
return &it->data;
QTC_ASSERT(it != m_storage.end(), return dummy);
return it->data.parameters();
}
BreakpointId BreakHandler::findWatchpointByAddress(quint64 address) const
@@ -626,9 +620,9 @@ void BreakHandler::appendBreakpoint(const BreakpointParameters &data)
BreakpointId id(++currentId);
BreakpointItem item;
BreakpointData d;
d.m_parameters = data;
item.data = d;
item.data.m_parameters = data;
item.markerFileName = data.fileName;
item.markerLineNumber = data.lineNumber;
m_storage.insert(id, item);
scheduleSynchronization();
}
@@ -855,7 +849,7 @@ void BreakHandler::setResponse(BreakpointId id, const BreakpointResponse &data)
updateMarker(id);
}
void BreakHandler::setData(BreakpointId id, const BreakpointParameters &data)
void BreakHandler::setBreakpointData(BreakpointId id, const BreakpointParameters &data)
{
Iterator it = m_storage.find(id);
QTC_ASSERT(it != m_storage.end(), return);