diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:52:07 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:52:07 (GMT) |
| commit | 7799c68a964dd9a26cc98fa4b810fce7cc333e27 (patch) | |
| tree | 2c7bd25bcc45fc270746a4af6670e62836b4593f /src/corelib/tools | |
| parent | eb407209bb9f2c06684fd1299169cd3b8ab4b58d (diff) | |
| parent | 59949ff908995158462d456c14d4a3a10b19418e (diff) | |
| download | Qt-7799c68a964dd9a26cc98fa4b810fce7cc333e27.zip Qt-7799c68a964dd9a26cc98fa4b810fce7cc333e27.tar.gz Qt-7799c68a964dd9a26cc98fa4b810fce7cc333e27.tar.bz2 | |
Merge commit 'refs/merge-requests/828' of git://gitorious.org/qt/qt into integration
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 36827d0..a8bf38f 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -74,10 +74,6 @@ int qFindString(const QChar *haystack, int haystackLen, int from, #define RXERR_INTERVAL QT_TRANSLATE_NOOP("QRegExp", "invalid interval") #define RXERR_CATEGORY QT_TRANSLATE_NOOP("QRegExp", "invalid category") -/* - WARNING! Be sure to read qregexp.tex before modifying this file. -*/ - /*! \class QRegExp \reentrant diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 5be885b..dba53af 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -565,7 +565,7 @@ const QString::Null QString::null = { }; and join a list of strings into a single string with an optional separator using QStringList::join(). You can obtain a list of strings from a string list that contain a particular substring or - that match a particular QRegExp using the QStringList::find() + that match a particular QRegExp using the QStringList::filter() function. : \section1 Querying String Data |