X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ae3c17b4013e80b99976c750c19fca47729517f6..b09857ae000a60704207d63290be937584805fb0:/interface/wx/regex.h?ds=sidebyside diff --git a/interface/wx/regex.h b/interface/wx/regex.h index a61eaf28a4..cfba7bf245 100644 --- a/interface/wx/regex.h +++ b/interface/wx/regex.h @@ -3,7 +3,7 @@ // Purpose: interface of wxRegEx // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** @@ -57,7 +57,6 @@ enum /** @class wxRegEx - @wxheader{regex.h} wxRegEx represents a regular expression. This class provides support for regular expressions matching and also replacement. @@ -95,19 +94,19 @@ enum @code wxString text; ... - wxRegEx reEmail = wxT("([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)"); + wxRegEx reEmail = "([^@]+)@([[:alnum:].-_].)+([[:alnum:]]+)"; if ( reEmail.Matches(text) ) { wxString text = reEmail.GetMatch(email); wxString username = reEmail.GetMatch(email, 1); - if ( reEmail.GetMatch(email, 3) == wxT("com") ) // .com TLD? + if ( reEmail.GetMatch(email, 3) == "com" ) // .com TLD? { ... } } // or we could do this to hide the email address - size_t count = reEmail.ReplaceAll(text, wxT("HIDDEN@\\2\\3")); + size_t count = reEmail.ReplaceAll(text, "HIDDEN@\\2\\3"); printf("text now contains %u hidden addresses", count); @endcode */ @@ -164,7 +163,7 @@ public: wxString GetMatch(const wxString& text, size_t index = 0) const; /** - Returns the size of the array of matches, i.e. the number of bracketed + Returns the size of the array of matches, i.e.\ the number of bracketed subexpressions plus one for the expression itself, or 0 on error. May only be called after successful call to Compile(). @@ -199,7 +198,7 @@ public: May only be called after successful call to Compile(). */ bool Matches(const wxChar* text, int flags = 0) const; - const bool Matches(const wxChar* text, int flags, size_t len) const; + bool Matches(const wxChar* text, int flags, size_t len) const; //@} /** @@ -211,7 +210,7 @@ public: May only be called after successful call to Compile(). */ - const bool Matches(const wxString& text, int flags = 0) const; + bool Matches(const wxString& text, int flags = 0) const; /** Replaces the current regular expression in the string pointed to by