streamlining code

[wxWidgets.git] / include / wx / variant.h

diff --git a/include/wx/variant.h b/include/wx/variant.h
index a491b6f2ad99a6563cd8279ab1b2145ee9da1831..73e675eaeff1b9dddb3279854dc9ac247b01e0ca 100644 (file)
--- a/include/wx/variant.h
+++ b/include/wx/variant.h
@@ -210,8 +210,8 @@ public:
     wxVariant(const char* val, const wxString& name = wxEmptyString);
     wxVariant(const wchar_t* val, const wxString& name = wxEmptyString);
     wxVariant(const wxCStrData& val, const wxString& name = wxEmptyString);
     wxVariant(const char* val, const wxString& name = wxEmptyString);
     wxVariant(const wchar_t* val, const wxString& name = wxEmptyString);
     wxVariant(const wxCStrData& val, const wxString& name = wxEmptyString);

-    wxVariant(const wxCharBuffer& val, const wxString& name = wxEmptyString);
-    wxVariant(const wxWCharBuffer& val, const wxString& name = wxEmptyString);
+    wxVariant(const wxScopedCharBuffer& val, const wxString& name = wxEmptyString);
+    wxVariant(const wxScopedWCharBuffer& val, const wxString& name = wxEmptyString);

 
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;
 
     bool operator== (const wxString& value) const;
     bool operator!= (const wxString& value) const;


@@ -225,7 +225,7 @@ public:
     wxVariant& operator=(const wxCStrData& value)
         { return *this = value.AsString(); }
     template<typename T>
     wxVariant& operator=(const wxCStrData& value)
         { return *this = value.AsString(); }
     template<typename T>

-    wxVariant& operator=(const wxCharTypeBuffer<T>& value)
+    wxVariant& operator=(const wxScopedCharTypeBuffer<T>& value)

         { return *this = value.data(); }
 
     inline operator wxString () const {  return MakeString(); }
         { return *this = value.data(); }
 
     inline operator wxString () const {  return MakeString(); }