summaryrefslogtreecommitdiffstats
path: root/lldb
diff options
context:
space:
mode:
Diffstat (limited to 'lldb')
-rw-r--r--lldb/include/lldb/Core/DataVisualization.h6
-rw-r--r--lldb/source/Commands/CommandObjectFrame.cpp2
-rw-r--r--lldb/source/Commands/CommandObjectType.cpp32
-rw-r--r--lldb/source/Core/DataVisualization.cpp6
-rw-r--r--lldb/source/Core/ValueObject.cpp6
5 files changed, 26 insertions, 26 deletions
diff --git a/lldb/include/lldb/Core/DataVisualization.h b/lldb/include/lldb/Core/DataVisualization.h
index 9965eb5be34..5ee10b69030 100644
--- a/lldb/include/lldb/Core/DataVisualization.h
+++ b/lldb/include/lldb/Core/DataVisualization.h
@@ -49,7 +49,7 @@ public:
{
public:
static lldb::ValueFormatSP
- Get (ValueObject& valobj, lldb::DynamicValueType use_dynamic);
+ GetFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic);
static void
Add (const ConstString &type, const lldb::ValueFormatSP &entry);
@@ -86,7 +86,7 @@ public:
{
public:
static bool
- Get (const ConstString &type, lldb::SummaryFormatSP &entry);
+ GetSummaryFormat (const ConstString &type, lldb::SummaryFormatSP &entry);
static void
Add (const ConstString &type, const lldb::SummaryFormatSP &entry);
@@ -109,7 +109,7 @@ public:
public:
static bool
- Get (const ConstString &category, lldb::FormatCategorySP &entry);
+ GetCategory (const ConstString &category, lldb::FormatCategorySP &entry);
static void
Add (const ConstString &category);
diff --git a/lldb/source/Commands/CommandObjectFrame.cpp b/lldb/source/Commands/CommandObjectFrame.cpp
index 1247209d8cd..58cb095eb04 100644
--- a/lldb/source/Commands/CommandObjectFrame.cpp
+++ b/lldb/source/Commands/CommandObjectFrame.cpp
@@ -394,7 +394,7 @@ public:
SummaryFormatSP summary_format_sp;
if (!m_option_variable.summary.empty())
- DataVisualization::NamedSummaryFormats::Get(ConstString(m_option_variable.summary.c_str()), summary_format_sp);
+ DataVisualization::NamedSummaryFormats::GetSummaryFormat(ConstString(m_option_variable.summary.c_str()), summary_format_sp);
ValueObject::DumpValueObjectOptions options;
diff --git a/lldb/source/Commands/CommandObjectType.cpp b/lldb/source/Commands/CommandObjectType.cpp
index cfdfc98f900..6c6b84243fd 100644
--- a/lldb/source/Commands/CommandObjectType.cpp
+++ b/lldb/source/Commands/CommandObjectType.cpp
@@ -1049,7 +1049,7 @@ CommandObjectTypeSummaryAdd::AddSummary(const ConstString& type_name,
Error* error)
{
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(category_name.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(category_name.c_str()), category);
if (type == eRegexSummary)
{
@@ -1234,7 +1234,7 @@ public:
}
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(m_options.m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
bool delete_category = category->Delete(typeCS,
eFormatCategoryItemSummary | eFormatCategoryItemRegexSummary);
@@ -1365,10 +1365,10 @@ public:
{
const char* cat_name = command.GetArgumentAtIndex(0);
ConstString cat_nameCS(cat_name);
- DataVisualization::Categories::Get(cat_nameCS, category);
+ DataVisualization::Categories::GetCategory(cat_nameCS, category);
}
else
- DataVisualization::Categories::Get(ConstString(NULL), category);
+ DataVisualization::Categories::GetCategory(ConstString(NULL), category);
category->Clear(eFormatCategoryItemSummary | eFormatCategoryItemRegexSummary);
}
@@ -1667,7 +1667,7 @@ public:
}
DataVisualization::Categories::Enable(typeCS);
lldb::FormatCategorySP cate;
- if (DataVisualization::Categories::Get(typeCS, cate) && cate.get())
+ if (DataVisualization::Categories::GetCategory(typeCS, cate) && cate.get())
{
if (cate->GetCount() == 0)
{
@@ -2462,7 +2462,7 @@ public:
}
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(m_options.m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
bool delete_category = category->GetFilterNavigator()->Delete(typeCS);
delete_category = category->GetRegexFilterNavigator()->Delete(typeCS) || delete_category;
@@ -2624,7 +2624,7 @@ public:
}
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(m_options.m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
bool delete_category = category->GetSyntheticNavigator()->Delete(typeCS);
delete_category = category->GetRegexSyntheticNavigator()->Delete(typeCS) || delete_category;
@@ -2757,10 +2757,10 @@ public:
{
const char* cat_name = command.GetArgumentAtIndex(0);
ConstString cat_nameCS(cat_name);
- DataVisualization::Categories::Get(cat_nameCS, category);
+ DataVisualization::Categories::GetCategory(cat_nameCS, category);
}
else
- DataVisualization::Categories::Get(ConstString(NULL), category);
+ DataVisualization::Categories::GetCategory(ConstString(NULL), category);
category->GetFilterNavigator()->Clear();
category->GetRegexFilterNavigator()->Clear();
}
@@ -2883,10 +2883,10 @@ public:
{
const char* cat_name = command.GetArgumentAtIndex(0);
ConstString cat_nameCS(cat_name);
- DataVisualization::Categories::Get(cat_nameCS, category);
+ DataVisualization::Categories::GetCategory(cat_nameCS, category);
}
else
- DataVisualization::Categories::Get(ConstString(NULL), category);
+ DataVisualization::Categories::GetCategory(ConstString(NULL), category);
category->GetSyntheticNavigator()->Clear();
category->GetRegexSyntheticNavigator()->Clear();
}
@@ -3037,7 +3037,7 @@ public:
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(options->m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(options->m_category.c_str()), category);
Error error;
@@ -3156,7 +3156,7 @@ CommandObjectTypeSynthAdd::Execute_PythonClass (Args& command, CommandReturnObje
// now I have a valid provider, let's add it to every type
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(m_options.m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
Error error;
@@ -3215,7 +3215,7 @@ CommandObjectTypeSynthAdd::AddSynth(const ConstString& type_name,
Error* error)
{
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(category_name.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(category_name.c_str()), category);
if (category->AnyMatches(type_name,
eFormatCategoryItemFilter | eFormatCategoryItemRegexFilter,
@@ -3392,7 +3392,7 @@ private:
Error* error)
{
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(category_name.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(category_name.c_str()), category);
if (category->AnyMatches(type_name,
eFormatCategoryItemSynth | eFormatCategoryItemRegexSynth,
@@ -3514,7 +3514,7 @@ public:
// now I have a valid provider, let's add it to every type
lldb::FormatCategorySP category;
- DataVisualization::Categories::Get(ConstString(m_options.m_category.c_str()), category);
+ DataVisualization::Categories::GetCategory(ConstString(m_options.m_category.c_str()), category);
Error error;
diff --git a/lldb/source/Core/DataVisualization.cpp b/lldb/source/Core/DataVisualization.cpp
index 3b310ebf0df..ce587dc944f 100644
--- a/lldb/source/Core/DataVisualization.cpp
+++ b/lldb/source/Core/DataVisualization.cpp
@@ -39,7 +39,7 @@ DataVisualization::GetCurrentRevision ()
}
lldb::ValueFormatSP
-DataVisualization::ValueFormats::Get (ValueObject& valobj, lldb::DynamicValueType use_dynamic)
+DataVisualization::ValueFormats::GetFormat (ValueObject& valobj, lldb::DynamicValueType use_dynamic)
{
lldb::ValueFormatSP entry;
GetFormatManager().GetValueNavigator().Get(valobj, entry, use_dynamic);
@@ -105,7 +105,7 @@ DataVisualization::AnyMatches (ConstString type_name,
}
bool
-DataVisualization::Categories::Get (const ConstString &category, lldb::FormatCategorySP &entry)
+DataVisualization::Categories::GetCategory (const ConstString &category, lldb::FormatCategorySP &entry)
{
entry = GetFormatManager().GetCategory(category);
return true;
@@ -168,7 +168,7 @@ DataVisualization::Categories::GetCount ()
}
bool
-DataVisualization::NamedSummaryFormats::Get (const ConstString &type, lldb::SummaryFormatSP &entry)
+DataVisualization::NamedSummaryFormats::GetSummaryFormat (const ConstString &type, lldb::SummaryFormatSP &entry)
{
return GetFormatManager().GetNamedSummaryNavigator().Get(type,entry);
}
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index eba5edc95bb..e63cc34782d 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -248,9 +248,9 @@ ValueObject::UpdateFormatsIfNeeded(DynamicValueType use_dynamic)
if ( (m_last_format_mgr_revision != DataVisualization::GetCurrentRevision()) ||
m_last_format_mgr_dynamic != use_dynamic)
{
- SetValueFormat(DataVisualization::ValueFormats::Get(*this, eNoDynamicValues));
- SetSummaryFormat(DataVisualization::GetSummaryFormat(*this, use_dynamic));
- SetSyntheticChildren(DataVisualization::GetSyntheticChildren(*this, use_dynamic));
+ SetValueFormat(DataVisualization::ValueFormats::GetFormat (*this, eNoDynamicValues));
+ SetSummaryFormat(DataVisualization::GetSummaryFormat (*this, use_dynamic));
+ SetSyntheticChildren(DataVisualization::GetSyntheticChildren (*this, use_dynamic));
m_last_format_mgr_revision = DataVisualization::GetCurrentRevision();
m_last_format_mgr_dynamic = use_dynamic;
OpenPOWER on IntegriCloud