8 files changed, 20 insertions, 20 deletions
diff --git a/lldb/source/Core/Address.cpp b/lldb/source/Core/Address.cpp
index 12de3aaaeb0..004798e7bd3 100644
--- a/lldb/source/Core/Address.cpp
+++ b/lldb/source/Core/Address.cpp
@@ -377,7 +377,7 @@ Address::Dump (Stream *s, ExecutionContextScope *exe_scope, DumpStyle style, Dum
     case DumpStyleResolvedDescriptionNoModule:
         if (IsSectionOffset())
         {
-            lldb::AddressType addr_type = eAddressTypeLoad;
+            AddressType addr_type = eAddressTypeLoad;
             addr_t addr = GetLoadAddress (target);
             if (addr == LLDB_INVALID_ADDRESS)
             {
@@ -809,7 +809,7 @@ Address::ResolveLinkedAddress ()
     }
 }
 
-lldb::AddressClass
+AddressClass
 Address::GetAddressClass () const
 {
     Module *module = GetModule();
diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp
index b44aa21842c..17134938d09 100644
--- a/lldb/source/Core/ArchSpec.cpp
+++ b/lldb/source/Core/ArchSpec.cpp
@@ -285,7 +285,7 @@ ArchSpec::ArchSpec(const llvm::Triple &triple) :
     SetTriple(triple);
 }
 
-ArchSpec::ArchSpec (lldb::ArchitectureType arch_type, uint32_t cpu, uint32_t subtype) :
+ArchSpec::ArchSpec (ArchitectureType arch_type, uint32_t cpu, uint32_t subtype) :
     m_triple (),
     m_core (kCore_invalid),
     m_byte_order (eByteOrderInvalid)
@@ -463,7 +463,7 @@ ArchSpec::SetTriple (const char *triple_cstr)
 }
 
 bool
-ArchSpec::SetArchitecture (lldb::ArchitectureType arch_type, uint32_t cpu, uint32_t sub)
+ArchSpec::SetArchitecture (ArchitectureType arch_type, uint32_t cpu, uint32_t sub)
 {
     m_core = kCore_invalid;
     bool update_triple = true;
diff --git a/lldb/source/Core/Debugger.cpp b/lldb/source/Core/Debugger.cpp
index 89ceab95006..ca0dde920bd 100644
--- a/lldb/source/Core/Debugger.cpp
+++ b/lldb/source/Core/Debugger.cpp
@@ -762,7 +762,7 @@ Debugger::FormatPrompt
                         RegisterKind reg_kind = kNumRegisterKinds; 
                         uint32_t reg_num = LLDB_INVALID_REGNUM;
                         FileSpec format_file_spec;
-                        const lldb::RegisterInfo *reg_info = NULL;
+                        const RegisterInfo *reg_info = NULL;
                         RegisterContext *reg_ctx = NULL;
 
                         // Each variable must set success to true below...
@@ -1440,7 +1440,7 @@ DebuggerInstanceSettings::UpdateInstanceSettingsVariable (const ConstString &var
                                                           const char *value,
                                                           const ConstString &instance_name,
                                                           const SettingEntry &entry,
-                                                          lldb::VarSetOperationType op,
+                                                          VarSetOperationType op,
                                                           Error &err,
                                                           bool pending)
 {
diff --git a/lldb/source/Core/EmulateInstruction.cpp b/lldb/source/Core/EmulateInstruction.cpp
index d596cdd2291..05ded393560 100644
--- a/lldb/source/Core/EmulateInstruction.cpp
+++ b/lldb/source/Core/EmulateInstruction.cpp
@@ -59,9 +59,9 @@ EmulateInstruction::EmulateInstruction
     m_write_mem_callback (write_mem_callback),
     m_read_reg_callback (read_reg_callback),
     m_write_reg_callback (write_reg_callback),
-    m_inst_pc (LLDB_INVALID_ADDRESS)
+    m_opcode_pc (LLDB_INVALID_ADDRESS)
 {
-    ::memset (&m_inst, 0, sizeof (m_inst));
+    ::memset (&m_opcode, 0, sizeof (m_opcode));
 }
 
 uint64_t
diff --git a/lldb/source/Core/Section.cpp b/lldb/source/Core/Section.cpp
index d2682f5bded..0765c546384 100644
--- a/lldb/source/Core/Section.cpp
+++ b/lldb/source/Core/Section.cpp
@@ -567,7 +567,7 @@ SectionList::FindSectionByID (user_id_t sect_id) const
 
 
 SectionSP
-SectionList::FindSectionByType (lldb::SectionType sect_type, bool check_children, uint32_t start_idx) const
+SectionList::FindSectionByType (SectionType sect_type, bool check_children, uint32_t start_idx) const
 {
     SectionSP sect_sp;
     uint32_t num_sections = m_sections.size();
diff --git a/lldb/source/Core/Value.cpp b/lldb/source/Core/Value.cpp
index 98aac432231..2d8ac9147ce 100644
--- a/lldb/source/Core/Value.cpp
+++ b/lldb/source/Core/Value.cpp
@@ -208,7 +208,7 @@ Value::GetValueType() const
     return m_value_type;
 }
 
-lldb::AddressType
+AddressType
 Value::GetValueAddressType () const
 {
     if (m_context_type == eContextTypeValue)
@@ -515,7 +515,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, clang::ASTContext *ast_context
 
     Error error;
     lldb::addr_t address = LLDB_INVALID_ADDRESS;
-    lldb::AddressType address_type = eAddressTypeFile;
+    AddressType address_type = eAddressTypeFile;
     switch (m_value_type)
     {
     default:
@@ -663,7 +663,7 @@ Value::GetValueAsData (ExecutionContext *exe_ctx, clang::ASTContext *ast_context
         }
         else
         {
-            error.SetErrorStringWithFormat ("unsupported lldb::AddressType value (%i)", address_type);
+            error.SetErrorStringWithFormat ("unsupported AddressType value (%i)", address_type);
         }
     }
     else
@@ -714,7 +714,7 @@ Value::ResolveValue(ExecutionContext *exe_ctx, clang::ASTContext *ast_context)
         case eValueTypeLoadAddress:          // load address value
         case eValueTypeHostAddress:          // host address value (for memory in the process that is using liblldb)
             {
-                lldb::AddressType address_type = m_value_type == eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost;
+                AddressType address_type = m_value_type == eValueTypeLoadAddress ? eAddressTypeLoad : eAddressTypeHost;
                 lldb::addr_t addr = m_value.ULongLong(LLDB_INVALID_ADDRESS);
                 DataExtractor data;
                 if (ClangASTType::ReadFromMemory (ast_context, opaque_clang_qual_type, exe_ctx, addr, address_type, data))
diff --git a/lldb/source/Core/ValueObject.cpp b/lldb/source/Core/ValueObject.cpp
index 9346db4280c..948ace752d1 100644
--- a/lldb/source/Core/ValueObject.cpp
+++ b/lldb/source/Core/ValueObject.cpp
@@ -439,7 +439,7 @@ ValueObject::GetSummaryAsCString (ExecutionContextScope *exe_scope)
                     if (process != NULL)
                     {
                         lldb::addr_t cstr_address = LLDB_INVALID_ADDRESS;
-                        lldb::AddressType cstr_address_type = eAddressTypeInvalid;
+                        AddressType cstr_address_type = eAddressTypeInvalid;
 
                         size_t cstr_len = 0;
                         if (type_flags.Test (ClangASTContext::eTypeIsArray))
@@ -521,7 +521,7 @@ ValueObject::GetSummaryAsCString (ExecutionContextScope *exe_scope)
                 }
                 else if (ClangASTContext::IsFunctionPointerType (clang_type))
                 {
-                    lldb::AddressType func_ptr_address_type = eAddressTypeInvalid;
+                    AddressType func_ptr_address_type = eAddressTypeInvalid;
                     lldb::addr_t func_ptr_address = GetPointerValue (func_ptr_address_type, true);
 
                     if (func_ptr_address != 0 && func_ptr_address != LLDB_INVALID_ADDRESS)
@@ -684,7 +684,7 @@ ValueObject::GetValueAsCString (ExecutionContextScope *exe_scope)
 }
 
 addr_t
-ValueObject::GetAddressOf (lldb::AddressType &address_type, bool scalar_is_load_address)
+ValueObject::GetAddressOf (AddressType &address_type, bool scalar_is_load_address)
 {
     switch (m_value.GetValueType())
     {
@@ -710,7 +710,7 @@ ValueObject::GetAddressOf (lldb::AddressType &address_type, bool scalar_is_load_
 }
 
 addr_t
-ValueObject::GetPointerValue (lldb::AddressType &address_type, bool scalar_is_load_address)
+ValueObject::GetPointerValue (AddressType &address_type, bool scalar_is_load_address)
 {
     lldb::addr_t address = LLDB_INVALID_ADDRESS;
     address_type = eAddressTypeInvalid;
@@ -1145,7 +1145,7 @@ ValueObject::DumpValueObject
                 {
                     // We have a pointer or reference whose value is an address.
                     // Make sure that address is not NULL
-                    lldb::AddressType ptr_address_type;
+                    AddressType ptr_address_type;
                     if (valobj->GetPointerValue (ptr_address_type, true) == 0)
                         print_children = false;
 
@@ -1339,7 +1339,7 @@ ValueObject::Dereference (Error &error)
 ValueObject::AddressOf (Error &error)
 {
     lldb::ValueObjectSP valobj_sp;
-    lldb::AddressType address_type = eAddressTypeInvalid;
+    AddressType address_type = eAddressTypeInvalid;
     const bool scalar_is_load_address = false;
     lldb::addr_t addr = GetAddressOf (address_type, scalar_is_load_address);
     error.Clear();
diff --git a/lldb/source/Core/ValueObjectConstResult.cpp b/lldb/source/Core/ValueObjectConstResult.cpp
index 253c374c90c..55273a9a7be 100644
--- a/lldb/source/Core/ValueObjectConstResult.cpp
+++ b/lldb/source/Core/ValueObjectConstResult.cpp
@@ -97,7 +97,7 @@ ValueObjectConstResult::ValueObjectConstResult
     void *clang_type,
     const ConstString &name,
     lldb::addr_t address,
-    lldb::AddressType address_type,
+    AddressType address_type,
     uint8_t addr_byte_size
 ) :
     ValueObject (NULL),