diff options
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qregexp.cpp | 7 | ||||
-rw-r--r-- | src/corelib/tools/qregexp.h | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 77ea5bd852..70cae5ceee 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -4316,18 +4316,13 @@ int QRegExp::matchedLength() const #ifndef QT_NO_REGEXP_CAPTURE -#ifndef QT_NO_DEPRECATED /*! + \fn int QRegExp::numCaptures() const \obsolete Returns the number of captures contained in the regular expression. \sa captureCount() */ -int QRegExp::numCaptures() const -{ - return captureCount(); -} -#endif /*! \since 4.6 diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 580629fbc4..0455e1603e 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -99,9 +99,6 @@ public: int lastIndexIn(const QString &str, int offset = -1, CaretMode caretMode = CaretAtZero) const; int matchedLength() const; #ifndef QT_NO_REGEXP_CAPTURE -#ifdef QT_DEPRECATED - QT_DEPRECATED int numCaptures() const; -#endif int captureCount() const; QStringList capturedTexts() const; QStringList capturedTexts(); |