summaryrefslogtreecommitdiffstats
path: root/lldb/source/Target/Process.cpp
diff options
context:
space:
mode:
authorJim Ingham <jingham@apple.com>2010-09-07 20:27:09 +0000
committerJim Ingham <jingham@apple.com>2010-09-07 20:27:09 +0000
commit95852755a84a744f549dcbc15ca9e76a6d6cf3a5 (patch)
treeb71cded162d7e359b69b7779ba1a828d69fdfc61 /lldb/source/Target/Process.cpp
parent7c483028fbe09b56e4ee62201f3f5dc9e18e5687 (diff)
downloadbcm5719-llvm-95852755a84a744f549dcbc15ca9e76a6d6cf3a5.tar.gz
bcm5719-llvm-95852755a84a744f549dcbc15ca9e76a6d6cf3a5.zip
Move common code from GetSettingsController in Process & Debugger into static functions
in UserSettingsController.cpp. llvm-svn: 113268
Diffstat (limited to 'lldb/source/Target/Process.cpp')
-rw-r--r--lldb/source/Target/Process.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/lldb/source/Target/Process.cpp b/lldb/source/Target/Process.cpp
index 19b0d4f81e6..fa0fd19dcae 100644
--- a/lldb/source/Target/Process.cpp
+++ b/lldb/source/Target/Process.cpp
@@ -1929,26 +1929,16 @@ Process::GetSettingsController (bool finish)
if (!initialized)
{
- const lldb::UserSettingsControllerSP &parent = g_settings_controller->GetParent ();
- if (parent)
- parent->RegisterChild (g_settings_controller);
-
- g_settings_controller->CreateSettingsVector (Process::ProcessSettingsController::global_settings_table,
- true);
- g_settings_controller->CreateSettingsVector (Process::ProcessSettingsController::instance_settings_table,
- false);
-
- g_settings_controller->InitializeGlobalVariables ();
- g_settings_controller->CreateDefaultInstanceSettings ();
- initialized = true;
+ initialized = UserSettingsController::InitializeSettingsController (g_settings_controller,
+ Process::ProcessSettingsController::global_settings_table,
+ Process::ProcessSettingsController::instance_settings_table);
}
if (finish)
{
- const lldb::UserSettingsControllerSP &parent = g_settings_controller->GetParent ();
- if (parent)
- parent->RemoveChild (g_settings_controller);
+ UserSettingsController::FinalizeSettingsController (g_settings_controller);
g_settings_controller.reset();
+ initialized = false;
}
return g_settings_controller;
OpenPOWER on IntegriCloud