1 files changed, 19 insertions, 37 deletions

diff --git a/lldb/include/lldb/API/SBValue.h b/lldb/include/lldb/API/SBValue.h
index 44ec2cdb8a3..48fa0f3b478 100644
--- a/lldb/include/lldb/API/SBValue.h
+++ b/lldb/include/lldb/API/SBValue.h
@@ -22,17 +22,17 @@ class SBValue
 public:
     SBValue ();
 
-    SBValue (const SBValue &rhs);
+    SBValue (const lldb::SBValue &rhs);
 
 #ifndef SWIG
-    const SBValue &
-    operator =(const SBValue &rhs);
+    lldb::SBValue &
+    operator =(const lldb::SBValue &rhs);
 #endif
 
     ~SBValue ();
 
     bool
-    IsValid() const;
+    IsValid();
     
     SBError
     GetError();
@@ -50,28 +50,22 @@ public:
     GetByteSize ();
 
     bool
-    IsInScope (const lldb::SBFrame &frame);  // DEPRECATED - SBValues know their own frames.
-
-    bool
     IsInScope ();
 
     lldb::Format
-    GetFormat () const;
+    GetFormat ();
     
     void
     SetFormat (lldb::Format format);
 
     const char *
-    GetValue (const lldb::SBFrame &frame);   // DEPRECATED - SBValues know their own frames.
-
-    const char *
     GetValue ();
 
     int64_t
-    GetValueAsSigned(SBError& error, int64_t fail_value=0);
+    GetValueAsSigned (lldb::SBError& error, int64_t fail_value=0);
     
     uint64_t
-    GetValueAsUnsigned(SBError& error, uint64_t fail_value=0);
+    GetValueAsUnsigned (lldb::SBError& error, uint64_t fail_value=0);
     
     int64_t
     GetValueAsSigned(int64_t fail_value=0);
@@ -83,56 +77,43 @@ public:
     GetValueType ();
 
     bool
-    GetValueDidChange (const lldb::SBFrame &frame);  // DEPRECATED - SBValues know their own frames.
-
-    bool
     GetValueDidChange ();
 
     const char *
-    GetSummary (const lldb::SBFrame &frame);  // DEPRECATED - SBValues know their own frames.
-    
-    const char *
     GetSummary ();
     
     const char *
-    GetObjectDescription (const lldb::SBFrame &frame);  // DEPRECATED - SBValues know their own frames.
-
-    const char *
     GetObjectDescription ();
 
     const char *
-    GetLocation (const lldb::SBFrame &frame);  // DEPRECATED - SBValues know their own frames.
-
-    const char *
     GetLocation ();
 
     bool
-    SetValueFromCString (const lldb::SBFrame &frame, const char *value_str);  // DEPRECATED - SBValues know their own frames.
-
-    bool
     SetValueFromCString (const char *value_str);
 
     lldb::SBValue
     GetChildAtIndex (uint32_t idx);
     
     lldb::SBValue
-    CreateChildAtOffset (const char *name, uint32_t offset, const SBType& type);
+    CreateChildAtOffset (const char *name, uint32_t offset, lldb::SBType type);
     
     lldb::SBValue
-    Cast(const SBType& type);
+    Cast (lldb::SBType type);
     
     lldb::SBValue
     CreateValueFromExpression (const char *name, const char* expression);
     
     lldb::SBValue
-    CreateValueFromAddress(const char* name, lldb::addr_t address, const SBType& type);
+    CreateValueFromAddress (const char* name, 
+                            lldb::addr_t address, 
+                            lldb::SBType type);
     
     // this has no address! GetAddress() and GetLoadAddress() as well as AddressOf()
     // on the return of this call all return invalid
     lldb::SBValue
     CreateValueFromData (const char* name,
-                         const SBData& data,
-                         const SBType& type);
+                         lldb::SBData data,
+                         lldb::SBType type);
 
     //------------------------------------------------------------------
     /// Get a child value by index from a value.
@@ -279,7 +260,7 @@ public:
     bool
     TypeIsPointerType ();
     
-    SBType
+    lldb::SBType
     GetType();
 
     bool
@@ -289,7 +270,8 @@ public:
     GetExpressionPath (lldb::SBStream &description);
     
     bool
-    GetExpressionPath (lldb::SBStream &description, bool qualify_cxx_base_classes);
+    GetExpressionPath (lldb::SBStream &description, 
+                       bool qualify_cxx_base_classes);
 
     SBValue (const lldb::ValueObjectSP &value_sp);
 
@@ -298,8 +280,8 @@ public:
     // currently rely on being able to extract the SharedPointer out of an SBValue. if the implementation
     // is deferred to the .cpp file instead of being inlined here, the platform will fail to link
     // correctly. however, this is temporary till a better general solution is found. FIXME
-    const lldb::ValueObjectSP&
-    get_sp() const
+    lldb::ValueObjectSP&
+    get_sp()
     {
         return m_opaque_sp;
     }