commit 12cecd741d8a8069b81fbc9021610b92d1fceb7b
author Caroline Tice <ctice@apple.com> Mon Sep 20 21:37:42 2010 +0000
committer Caroline Tice <ctice@apple.com> Mon Sep 20 21:37:42 2010 +0000
tree 405cc6ed8a9bfe7f5a110cd6ace9df14280a188e
parent db5c09a8cde4cd654335d96f6ce992cae7ee846e

Make GetInstanceSettingsValue methods take an Error * rather than an Error &,
and have them return a bool to indicate success or not.

llvm-svn: 114361

lldb/source/Core/UserSettingsController.cpp

diff --git a/lldb/source/Core/UserSettingsController.cpp b/lldb/source/Core/UserSettingsController.cpp
index 82a58aad..a42dab0 100644
--- a/lldb/source/Core/UserSettingsController.cpp
+++ b/lldb/source/Core/UserSettingsController.cpp
@@ -562,7 +562,7 @@
 
                 if (current_settings != NULL)
                 {
-                    current_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+                    current_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
                 }
                 else
                 {
@@ -575,14 +575,14 @@
                     if (pos != m_pending_settings.end())
                     {
                         lldb::InstanceSettingsSP settings_sp = pos->second;
-                        settings_sp->GetInstanceSettingsValue (*instance_entry, const_var_name,  value, err);
+                        settings_sp->GetInstanceSettingsValue (*instance_entry, const_var_name,  value, &err);
                     }
                     else 
                     {
                         if (m_settings.level_name.GetLength() > 0)
                         {
                             // No valid instance name; assume they want the default settings.
-                            m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+                            m_default_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
                         }
                         else
                         {
@@ -595,7 +595,7 @@
                             ConstString dbg_name (debugger_instance_name);
                             InstanceSettings *dbg_settings = FindSettingsForInstance (dbg_name);
                             if (dbg_settings)
-                                dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+                                dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
                         }
                     }
                 }
@@ -621,7 +621,7 @@
         {
             var_type = instance_entry->var_type;
             if (m_settings.level_name.GetLength() > 0)
-                m_default_settings->GetInstanceSettingsValue  (*instance_entry, const_var_name, value, err);
+                m_default_settings->GetInstanceSettingsValue  (*instance_entry, const_var_name, value, &err);
             else
             {
                 // We're at the Debugger level;  use the debugger's instance settings.
@@ -633,7 +633,7 @@
                 ConstString dbg_name (tmp_name.GetData());
                 InstanceSettings *dbg_settings = FindSettingsForInstance (dbg_name);
                 if (dbg_settings)
-                    dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, err);
+                    dbg_settings->GetInstanceSettingsValue (*instance_entry, const_var_name, value, &err);
             }
         }
     }
@@ -716,7 +716,7 @@
         SettingEntry &entry = m_settings.instance_settings[i];
         ConstString var_name (entry.var_name);
         StringList value;
-        m_default_settings->GetInstanceSettingsValue (entry, var_name, value, err);
+        m_default_settings->GetInstanceSettingsValue (entry, var_name, value, NULL);
 
         std::string value_str;
         if (value.GetSize() == 1)
@@ -777,8 +777,7 @@
         SettingEntry &entry = m_settings.instance_settings[i];
         ConstString var_name (entry.var_name);
         StringList tmp_value;
-        Error err;
-        m_default_settings->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+        m_default_settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
 
         StreamString value_string;
 
@@ -817,8 +816,7 @@
             SettingEntry &entry = m_settings.instance_settings[i];
             ConstString var_name (entry.var_name);
             StringList tmp_value;
-            Error err;
-            settings_sp->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+            settings_sp->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
 
             StreamString value_str;
 
@@ -884,8 +882,7 @@
             SettingEntry &entry = m_settings.instance_settings[i];
             const ConstString var_name (entry.var_name);
             StringList tmp_value;
-            Error err;
-            settings->GetInstanceSettingsValue (entry, var_name, tmp_value, err);
+            settings->GetInstanceSettingsValue (entry, var_name, tmp_value, NULL);
             StreamString tmp_value_str;
 
             if (tmp_value.GetSize() == 0)