Change the Breakpoint & BreakpointLocation GetDescription methods so they call the BreakpointOptions::GetDescription rather
than picking bits out of the breakpoint options. Added BreakpointOptions::GetDescription to do this job. Some more mucking
around to keep the breakpoint listing from getting too verbose.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@106262 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Breakpoint/Breakpoint.cpp b/source/Breakpoint/Breakpoint.cpp
index b3576b6..fb277b2 100644
--- a/source/Breakpoint/Breakpoint.cpp
+++ b/source/Breakpoint/Breakpoint.cpp
@@ -380,28 +380,21 @@
s->Printf(" with 0 locations (Pending Breakpoint).");
}
+ GetOptions()->GetDescription(s, level);
+
if (level == lldb::eDescriptionLevelFull)
{
- Baton *baton = GetOptions()->GetBaton();
- if (baton)
- {
- s->EOL ();
- s->Indent();
- baton->GetDescription(s, level);
- }
+ s->IndentLess();
+ s->EOL();
}
break;
case lldb::eDescriptionLevelVerbose:
// Verbose mode does a debug dump of the breakpoint
Dump (s);
- Baton *baton = GetOptions()->GetBaton();
- if (baton)
- {
- s->EOL ();
- s->Indent();
- baton->GetDescription(s, level);
- }
+ s->EOL ();
+ s->Indent();
+ GetOptions()->GetDescription(s, level);
break;
}
@@ -420,7 +413,8 @@
}
}
-Breakpoint::BreakpointEventData::BreakpointEventData (Breakpoint::BreakpointEventData::EventSubType sub_type, BreakpointSP &new_breakpoint_sp) :
+Breakpoint::BreakpointEventData::BreakpointEventData (Breakpoint::BreakpointEventData::EventSubType sub_type,
+ BreakpointSP &new_breakpoint_sp) :
EventData (),
m_sub_type (sub_type),
m_new_breakpoint_sp (new_breakpoint_sp)