From: Włodzimierz Skiba Date: Mon, 2 Oct 2006 07:09:20 +0000 (+0000) Subject: Warning fixes after char->wxChar in wxVariant. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/07502d7351ab56770752ad01ee28af497cf2ab9c Warning fixes after char->wxChar in wxVariant. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41549 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/variant.h b/include/wx/variant.h index 848c0a0261..0e3e71f195 100644 --- a/include/wx/variant.h +++ b/include/wx/variant.h @@ -68,15 +68,15 @@ public: // Override these to provide common functionality virtual bool Eq(wxVariantData& data) const = 0; - + #if wxUSE_STD_IOSTREAM - virtual bool Write(wxSTD ostream& str) const { return false; } + virtual bool Write(wxSTD ostream& WXUNUSED(str)) const { return false; } #endif - virtual bool Write(wxString& str) const { return false; } + virtual bool Write(wxString& WXUNUSED(str)) const { return false; } #if wxUSE_STD_IOSTREAM - virtual bool Read(wxSTD istream& str) { return false; } + virtual bool Read(wxSTD istream& WXUNUSED(str)) { return false; } #endif - virtual bool Read(wxString& str) { return false; } + virtual bool Read(wxString& WXUNUSED(str)) { return false; } // What type is it? Return a string name. virtual wxString GetType() const = 0; // If it based on wxObject return the ClassInfo. @@ -99,7 +99,7 @@ protected: private: int m_count; - + private: DECLARE_ABSTRACT_CLASS(wxVariantData) }; @@ -113,7 +113,7 @@ class WXDLLIMPEXP_BASE wxVariant: public wxObject { public: wxVariant(); - + wxVariant(const wxVariant& variant); wxVariant(wxVariantData* data, const wxString& name = wxEmptyString); virtual ~wxVariant(); @@ -124,7 +124,7 @@ public: // Assignment using data, e.g. // myVariant = new wxStringVariantData("hello"); void operator= (wxVariantData* variantData); - + bool operator== (const wxVariant& variant) const; bool operator!= (const wxVariant& variant) const; @@ -133,7 +133,7 @@ public: inline const wxString& GetName() const { return m_name; } // Tests whether there is data - bool IsNull() const; + bool IsNull() const; // For compatibility with wxWidgets <= 2.6, this doesn't increase // reference count. @@ -148,10 +148,10 @@ public: // Make NULL (i.e. delete the data) void MakeNull(); - + // Delete data and name void Clear(); - + // Returns a string representing the type of the variant, // e.g. "string", "bool", "stringlist", "list", "double", "long" wxString GetType() const; @@ -159,9 +159,9 @@ public: bool IsType(const wxString& type) const; bool IsValueKindOf(const wxClassInfo* type) const; - // write contents to a string (e.g. for debugging) + // write contents to a string (e.g. for debugging) wxString MakeString() const; - + // double wxVariant(double val, const wxString& name = wxEmptyString); bool operator== (double value) const; @@ -170,7 +170,7 @@ public: inline operator double () const { return GetDouble(); } inline double GetReal() const { return GetDouble(); } double GetDouble() const; - + // long wxVariant(long val, const wxString& name = wxEmptyString); wxVariant(int val, const wxString& name = wxEmptyString); @@ -181,8 +181,8 @@ public: inline operator long () const { return GetLong(); } inline long GetInteger() const { return GetLong(); } long GetLong() const; - - // bool + + // bool #ifdef HAVE_BOOL wxVariant(bool val, const wxString& name = wxEmptyString); bool operator== (bool value) const; @@ -194,7 +194,7 @@ public: // wxDateTime #if wxUSE_DATETIME - wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); + wxVariant(const wxDateTime& val, const wxString& name = wxEmptyString); #if wxUSE_ODBC wxVariant(const DATE_STRUCT* valptr, const wxString& name = wxEmptyString); wxVariant(const TIME_STRUCT* valptr, const wxString& name = wxEmptyString); @@ -229,7 +229,7 @@ public: void operator= (wxChar value) ; inline operator wxChar () const { return GetChar(); } wxChar GetChar() const ; - + // wxArrayString wxVariant(const wxArrayString& val, const wxString& name = wxEmptyString); bool operator== (const wxArrayString& value) const; @@ -277,7 +277,7 @@ public: // Return the number of elements in a list size_t GetCount() const; - + // Make empty list void NullList(); @@ -311,7 +311,7 @@ public: protected: wxVariantData* m_data; wxString m_name; - + private: DECLARE_DYNAMIC_CLASS(wxVariant) }; @@ -320,11 +320,11 @@ private: #ifdef EMPTY_PARAMETER_VALUE #undef EMPTY_PARAMETER_VALUE #endif -#define EMPTY_PARAMETER_VALUE +#define EMPTY_PARAMETER_VALUE #define DECLARE_VARIANT_OBJECT(classname) \ DECLARE_VARIANT_OBJECT_EXPORTED(classname,EMPTY_PARAMETER_VALUE) - + #define DECLARE_VARIANT_OBJECT_EXPORTED(classname,expdecl) \ classname& expdecl operator << ( classname &object, const wxVariant &variant ); \ wxVariant& expdecl operator << ( wxVariant &variant, const classname &object ); diff --git a/src/common/variant.cpp b/src/common/variant.cpp index 333568d0cb..870938c773 100644 --- a/src/common/variant.cpp +++ b/src/common/variant.cpp @@ -290,7 +290,7 @@ bool wxVariantDataLong::Read(wxString& str) return true; } -// wxVariant +// wxVariant wxVariant::wxVariant(long val, const wxString& name) { @@ -695,7 +695,7 @@ bool wxVariantDataChar::Write(wxString& str) const bool wxVariantDataChar::Read(wxSTD istream& WXUNUSED(str)) { wxFAIL_MSG(wxT("Unimplemented")); - + return false; } #endif @@ -705,7 +705,8 @@ bool wxVariantDataChar::Write(wxOutputStream& str) const { wxTextOutputStream s(str); - s.Write8(m_value); + s << m_value; + return true; } @@ -854,7 +855,7 @@ bool wxVariantDataString::Read(wxString& str) IMPLEMENT_DYNAMIC_CLASS(wxVariantDataString, wxVariantData) // wxVariant **** - + wxVariant::wxVariant(const wxString& val, const wxString& name) { m_data = new wxVariantDataString(val); @@ -1840,7 +1841,7 @@ void wxVariant::operator= (const wxStringList& value) } } -// wxVariant +// wxVariant wxStringList& wxVariant::GetStringList() const {