From: Vadim Zeitlin Date: Mon, 23 Mar 2009 23:11:55 +0000 (+0000) Subject: make wxStringOperationsWchar methods templates too to be able to reuse them with... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/5b119b8b2e49ba2e36ca689b8bb85cce6341f47c make wxStringOperationsWchar methods templates too to be able to reuse them with char pointers (and for consistency with wxStringOperationsUtf8) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/stringops.h b/include/wx/stringops.h index 024968ece2..c7eb83bc4b 100644 --- a/include/wx/stringops.h +++ b/include/wx/stringops.h @@ -28,25 +28,21 @@ struct WXDLLIMPEXP_BASE wxStringOperationsWchar { // moves the iterator to the next Unicode character - static void IncIter(wxStringImpl::iterator& i) { ++i; } - static void IncIter(wxStringImpl::const_iterator& i) { ++i; } + template + static void IncIter(Iterator& i) { ++i; } // moves the iterator to the previous Unicode character - static void DecIter(wxStringImpl::iterator& i) { --i; } - static void DecIter(wxStringImpl::const_iterator& i) { --i; } + template + static void DecIter(Iterator& i) { --i; } // moves the iterator by n Unicode characters - static wxStringImpl::iterator AddToIter(const wxStringImpl::iterator& i, ptrdiff_t n) - { return i + n; } - static wxStringImpl::const_iterator AddToIter(const wxStringImpl::const_iterator& i, ptrdiff_t n) + template + static Iterator AddToIter(const Iterator& i, ptrdiff_t n) { return i + n; } // returns distance of the two iterators in Unicode characters - static ptrdiff_t DiffIters(const wxStringImpl::iterator& i1, - const wxStringImpl::iterator& i2) - { return i1 - i2; } - static ptrdiff_t DiffIters(const wxStringImpl::const_iterator& i1, - const wxStringImpl::const_iterator& i2) + template + static ptrdiff_t DiffIters(const Iterator& i1, const Iterator& i2) { return i1 - i2; } // encodes the character to a form used to represent it in internal