[Lldb-commits] [lldb] r193801 - Renaming the setting to enable/disable automatic one-lining of summaries as auto-one-line-summaries

[Enrico Granata]

Author: enrico
Date: Thu Oct 31 16:01:07 2013
New Revision: 193801

URL: http://llvm.org/viewvc/llvm-project?rev=193801&view=rev
Log:
Renaming the setting to enable/disable automatic one-lining of summaries as auto-one-line-summaries


Modified:
    lldb/trunk/include/lldb/Core/Debugger.h
    lldb/trunk/source/Core/Debugger.cpp
    lldb/trunk/source/DataFormatters/FormatManager.cpp

Modified: lldb/trunk/include/lldb/Core/Debugger.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Core/Debugger.h?rev=193801&r1=193800&r2=193801&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Core/Debugger.h (original)
+++ lldb/trunk/include/lldb/Core/Debugger.h Thu Oct 31 16:01:07 2013
@@ -322,7 +322,7 @@ public:
     GetDisassemblyLineCount () const;
     
     bool
-    GetEnableAutoOneLine () const;
+    GetAutoOneLineSummaries () const;
     
     bool
     GetNotifyVoid () const;

Modified: lldb/trunk/source/Core/Debugger.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Debugger.cpp?rev=193801&r1=193800&r2=193801&view=diff
==============================================================================
--- lldb/trunk/source/Core/Debugger.cpp (original)
+++ lldb/trunk/source/Core/Debugger.cpp Thu Oct 31 16:01:07 2013
@@ -132,7 +132,7 @@ g_properties[] =
 {   "thread-format",            OptionValue::eTypeString , true, 0    , DEFAULT_THREAD_FORMAT, NULL, "The default thread format string to use when displaying thread information." },
 {   "use-external-editor",      OptionValue::eTypeBoolean, true, false, NULL, NULL, "Whether to use an external editor or not." },
 {   "use-color",                OptionValue::eTypeBoolean, true, true , NULL, NULL, "Whether to use Ansi color codes or not." },
-{   "enable-auto-oneliner",     OptionValue::eTypeBoolean, true, true, NULL, NULL, "If true, LLDB will automatically display small structs in one-liner format (default: true)." },
+{   "auto-one-line-summaries",     OptionValue::eTypeBoolean, true, true, NULL, NULL, "If true, LLDB will automatically display small structs in one-liner format (default: true)." },
 
     {   NULL,                       OptionValue::eTypeInvalid, true, 0    , NULL, NULL, NULL }
 };
@@ -152,7 +152,7 @@ enum
     ePropertyThreadFormat,
     ePropertyUseExternalEditor,
     ePropertyUseColor,
-    ePropertyEnableAutoOneLine
+    ePropertyAutoOneLineSummaries
 };
 
 //
@@ -350,9 +350,9 @@ Debugger::GetDisassemblyLineCount () con
 }
 
 bool
-Debugger::GetEnableAutoOneLine () const
+Debugger::GetAutoOneLineSummaries () const
 {
-    const uint32_t idx = ePropertyEnableAutoOneLine;
+    const uint32_t idx = ePropertyAutoOneLineSummaries;
     return m_collection_sp->GetPropertyAtIndexAsBoolean (NULL, idx, true);
 
 }

Modified: lldb/trunk/source/DataFormatters/FormatManager.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/DataFormatters/FormatManager.cpp?rev=193801&r1=193800&r2=193801&view=diff
==============================================================================
--- lldb/trunk/source/DataFormatters/FormatManager.cpp (original)
+++ lldb/trunk/source/DataFormatters/FormatManager.cpp Thu Oct 31 16:01:07 2013
@@ -335,7 +335,7 @@ bool
 FormatManager::ShouldPrintAsOneLiner (ValueObject& valobj)
 {
     // if settings say no oneline whatsoever
-    if (valobj.GetTargetSP().get() && valobj.GetTargetSP()->GetDebugger().GetEnableAutoOneLine() == false)
+    if (valobj.GetTargetSP().get() && valobj.GetTargetSP()->GetDebugger().GetAutoOneLineSummaries() == false)
         return false; // then don't oneline
     
     // if this object has a summary, don't try to do anything special to it