X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c2b62db9173af22dc81aad5e26cbcbc4f2a6645..71ebd60b06f0c299b3f6ae3b11a8dcb4b0306493:/include/wx/stringimpl.h?ds=sidebyside diff --git a/include/wx/stringimpl.h b/include/wx/stringimpl.h index d81185344b..54b7af5919 100644 --- a/include/wx/stringimpl.h +++ b/include/wx/stringimpl.h @@ -23,7 +23,8 @@ // ---------------------------------------------------------------------------- #include "wx/defs.h" // everybody should include this -#include "wx/wxchar.h" // for wxChar, wxStrlen() etc. +#include "wx/chartype.h" // for wxChar +#include "wx/wxcrtbase.h" // for wxStrlen() etc. #include @@ -42,6 +43,10 @@ // global pointer to empty string extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString; +#if wxUSE_UNICODE_UTF8 +// FIXME-UTF8: we should have only one wxEmptyString +extern WXDLLIMPEXP_DATA_BASE(const wxStringCharType*) wxEmptyStringImpl; +#endif // ---------------------------------------------------------------------------- @@ -57,17 +62,20 @@ extern WXDLLIMPEXP_DATA_BASE(const wxChar*) wxEmptyString; #include #include "wx/afterstd.h" +#ifdef HAVE_STD_WSTRING + typedef std::wstring wxStdWideString; +#else + typedef std::basic_string wxStdWideString; +#endif + #if wxUSE_UNICODE_WCHAR - #ifdef HAVE_STD_WSTRING - typedef std::wstring wxStdString; - #else - typedef std::basic_string wxStdString; - #endif + typedef wxStdWideString wxStdString; #else typedef std::string wxStdString; #endif -#endif // need +#endif // wxUSE_STL_BASED_WXSTRING || wxUSE_STD_STRING + #if wxUSE_STL_BASED_WXSTRING @@ -97,8 +105,8 @@ struct WXDLLIMPEXP_BASE wxStringData size_t nDataLength, // actual string length nAllocLength; // allocated memory size - // mimics declaration 'wxChar data[nAllocLength]' - wxChar* data() const { return (wxChar*)(this + 1); } + // mimics declaration 'wxStringCharType data[nAllocLength]' + wxStringCharType* data() const { return (wxStringCharType*)(this + 1); } // empty string has a special ref count so it's never deleted bool IsEmpty() const { return (nRefs == -1); } @@ -143,7 +151,11 @@ protected: // string (re)initialization functions // initializes the string to the empty value (must be called only from // ctors, use Reinit() otherwise) +#if wxUSE_UNICODE_UTF8 + void Init() { m_pchData = (wxStringCharType *)wxEmptyStringImpl; } // FIXME-UTF8 +#else void Init() { m_pchData = (wxStringCharType *)wxEmptyString; } +#endif // initializes the string with (a part of) C-string void InitWith(const wxStringCharType *psz, size_t nPos = 0, size_t nLen = npos); // as Init, but also frees old data @@ -184,7 +196,9 @@ public: typedef wxStringCharType value_type; \ typedef ref_type reference; \ typedef ptr_type pointer; \ + typedef int difference_type; \ \ + iterator_name() : m_ptr(NULL) { } \ iterator_name(pointer ptr) : m_ptr(ptr) { } \ \ reference operator*() const { return *m_ptr; } \ @@ -205,16 +219,16 @@ public: return tmp; \ } \ \ - iterator_name operator+(int n) const \ + iterator_name operator+(ptrdiff_t n) const \ { return iterator_name(m_ptr + n); } \ - iterator_name operator-(int n) const \ + iterator_name operator-(ptrdiff_t n) const \ { return iterator_name(m_ptr - n); } \ - iterator_name& operator+=(int n) \ + iterator_name& operator+=(ptrdiff_t n) \ { m_ptr += n; return *this; } \ - iterator_name& operator-=(int n) \ + iterator_name& operator-=(ptrdiff_t n) \ { m_ptr -= n; return *this; } \ \ - size_t operator-(const iterator_name& i) const \ + difference_type operator-(const iterator_name& i) const \ { return m_ptr - i.m_ptr; } \ \ bool operator==(const iterator_name& i) const \ @@ -235,16 +249,16 @@ public: /* for wxStringImpl use only */ \ operator pointer() const { return m_ptr; } \ \ - friend class WXDLLIMPEXP_BASE wxStringImpl; \ + friend class wxStringImpl; \ \ pointer m_ptr // we need to declare const_iterator in wxStringImpl scope, the friend // declaration inside iterator class itself is not enough, or at least not // for g++ 3.4 (g++ 4 is ok) - class const_iterator; + class WXDLLIMPEXP_FWD_BASE const_iterator; - class iterator + class WXDLLIMPEXP_BASE iterator { WX_DEFINE_STRINGIMPL_ITERATOR(iterator, wxStringCharType&, @@ -253,7 +267,7 @@ public: friend class const_iterator; }; - class const_iterator + class WXDLLIMPEXP_BASE const_iterator { public: const_iterator(iterator i) : m_ptr(i.m_ptr) { } @@ -263,6 +277,8 @@ public: const wxStringCharType*); }; + #undef WX_DEFINE_STRINGIMPL_ITERATOR + // constructors and destructor // ctor for an empty string @@ -302,6 +318,17 @@ public: // take everything between start and end wxStringImpl(const_iterator start, const_iterator end); + + // ctor from and conversion to std::string +#if wxUSE_STD_STRING + wxStringImpl(const wxStdString& impl) + { InitWith(impl.c_str(), 0, impl.length()); } + + operator wxStdString() const + { return wxStdString(c_str(), length()); } +#endif + + // dtor is not virtual, this class must not be inherited from! ~wxStringImpl() { @@ -381,18 +408,18 @@ public: { return *this = str; } // same as ` = str[pos..pos + n] wxStringImpl& assign(const wxStringImpl& str, size_t pos, size_t n) - { clear(); return append(str, pos, n); } + { return replace(0, npos, str, pos, n); } // same as `= first n (or all if n == npos) characters of sz' wxStringImpl& assign(const wxStringCharType *sz) - { clear(); return append(sz, wxStrlen(sz)); } + { return replace(0, npos, sz, wxStrlen(sz)); } wxStringImpl& assign(const wxStringCharType *sz, size_t n) - { clear(); return append(sz, n); } + { return replace(0, npos, sz, n); } // same as `= n copies of ch' wxStringImpl& assign(size_t n, wxStringCharType ch) - { clear(); return append(n, ch); } + { return replace(0, npos, n, ch); } // assign from first to last wxStringImpl& assign(const_iterator first, const_iterator last) - { clear(); return append(first, last); } + { return replace(begin(), end(), first, last); } // first valid index position const_iterator begin() const { return m_pchData; } @@ -419,9 +446,9 @@ public: // insert first n (or all if n == npos) characters of sz wxStringImpl& insert(size_t nPos, const wxStringCharType *sz, size_t n = npos); // insert n copies of ch - wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch)// FIXME-UTF8: tricky + wxStringImpl& insert(size_t nPos, size_t n, wxStringCharType ch) { return insert(nPos, wxStringImpl(n, ch)); } - iterator insert(iterator it, wxStringCharType ch) // FIXME-UTF8: tricky + iterator insert(iterator it, wxStringCharType ch) { size_t idx = it - begin(); insert(idx, 1, ch); return begin() + idx; } void insert(iterator it, const_iterator first, const_iterator last) { insert(it - begin(), first, last - first); } @@ -443,18 +470,23 @@ public: const wxStringCharType* data() const { return m_pchData; } // replaces the substring of length nLen starting at nStart - wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz); + wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz) + { return replace(nStart, nLen, sz, npos); } // replaces the substring of length nLen starting at nStart wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringImpl& str) - { return replace(nStart, nLen, str.c_str()); } + { return replace(nStart, nLen, str.c_str(), str.length()); } // replaces the substring with nCount copies of ch - wxStringImpl& replace(size_t nStart, size_t nLen, size_t nCount, wxStringCharType ch); + wxStringImpl& replace(size_t nStart, size_t nLen, + size_t nCount, wxStringCharType ch) + { return replace(nStart, nLen, wxStringImpl(nCount, ch)); } // replaces a substring with another substring wxStringImpl& replace(size_t nStart, size_t nLen, - const wxStringImpl& str, size_t nStart2, size_t nLen2); + const wxStringImpl& str, size_t nStart2, size_t nLen2) + { return replace(nStart, nLen, str.substr(nStart2, nLen2)); } // replaces the substring with first nCount chars of sz wxStringImpl& replace(size_t nStart, size_t nLen, const wxStringCharType* sz, size_t nCount); + wxStringImpl& replace(iterator first, iterator last, const_pointer s) { return replace(first - begin(), last - first, s); } wxStringImpl& replace(iterator first, iterator last, const_pointer s, @@ -507,14 +539,12 @@ public: // string += char wxStringImpl& operator+=(wxStringCharType ch) { return append(1, ch); } -#if !wxUSE_UNICODE_UTF8 // helpers for wxStringBuffer and wxStringBufferLength wxStringCharType *DoGetWriteBuf(size_t nLen); void DoUngetWriteBuf(); void DoUngetWriteBuf(size_t nLen); -#endif - friend class WXDLLIMPEXP_BASE wxString; + friend class WXDLLIMPEXP_FWD_BASE wxString; }; #endif // !wxUSE_STL_BASED_WXSTRING