Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added "rest" argument to wxString::Before{First,Last}().

Browse Source 
This allows to search the string just once, in BeforeXXX(), when both the
parts of the string before and after some character are needed instead of
having to do it twice in both BeforeXXX() and AfterXXX().

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-10-22 14:17:37 +00:00
parent f48a115976
commit 6becc1e617
5 changed files with 77 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/common/string.cpp
View File

@@ -1349,22 +1349,43 @@ wxString wxString::Left(size_t nCount) const
// get all characters before the first occurrence of ch
// (returns the whole string if ch not found)
wxString wxString::BeforeFirst(wxUniChar ch) const
wxString wxString::BeforeFirst(wxUniChar ch, wxString *rest) const
{
int iPos = Find(ch);
if ( iPos == wxNOT_FOUND )
iPos = length();
{
iPos = length();
if ( rest )
rest->clear();
}
else
{
if ( rest )
rest->assign(*this, iPos + 1, npos);
}
return wxString(*this, 0, iPos);
}
/// get all characters before the last occurrence of ch
/// (returns empty string if ch not found)
wxString wxString::BeforeLast(wxUniChar ch) const
wxString wxString::BeforeLast(wxUniChar ch, wxString *rest) const
{
wxString str;
int iPos = Find(ch, true);
if ( iPos != wxNOT_FOUND && iPos != 0 )
str = wxString(c_str(), iPos);
if ( iPos != wxNOT_FOUND )
{
if ( iPos != 0 )
str.assign(*this, 0, iPos);
if ( rest )
rest->assign(*this, iPos + 1, npos);
}
else
{
if ( rest )
*rest = *this;
}
return str;
}