Remove all visible uses of "[DEFAULT]" instance name.

Add ability to rename UserSettingsInstances after they have been created
(via UserSettingsController::RenameInstanceSettings.

llvm-svn: 113950

1 files changed, 8 insertions, 2 deletions

diff --git a/lldb/include/lldb/Core/UserSettingsController.h b/lldb/include/lldb/Core/UserSettingsController.h
index 88d8a5ae3be..a2455d0f4d3 100644
--- a/lldb/include/lldb/Core/UserSettingsController.h
+++ b/lldb/include/lldb/Core/UserSettingsController.h
@@ -124,6 +124,9 @@ public:
     void
     UnregisterInstanceSettings (InstanceSettings *instance_settings);
 
+    void
+    RenameInstanceSettings (const char *old_name, const char *new_name);
+
     // -------------------------------------------------------------------------
     // Public static methods
     // -------------------------------------------------------------------------
@@ -324,7 +327,6 @@ private:
     std::vector<lldb::UserSettingsControllerSP> m_children;
     std::map <std::string, lldb::InstanceSettingsSP> m_pending_settings;
     std::map <std::string, InstanceSettings *> m_live_settings;    // live settings should never be NULL (hence 'live')
-
     mutable Mutex m_children_mutex;
     mutable Mutex m_pending_settings_mutex;
     mutable Mutex m_live_settings_mutex;
@@ -375,13 +377,17 @@ public:
     const ConstString &
     GetInstanceName () { return m_instance_name; }
 
+
+    void
+    ChangeInstanceName (const std::string &new_instance_name);
+
     static const ConstString &
     GetDefaultName ();
 
 protected:
 
     UserSettingsController &m_owner;
-    const ConstString m_instance_name;
+    ConstString m_instance_name;
 };