summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qregexp.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2012-01-24 22:26:31 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-31 16:17:55 +0100
commit3855233dab82946ba50ddd90ce86df035998da8e (patch)
tree908cdc84626a17dde6450810f97859502dcddab3 /src/corelib/tools/qregexp.cpp
parent9a4d30d9995a806ca7c69692992383b28c655054 (diff)
Remove many deprecated methods
Remove methods that have been marked as deprecated before Qt 4.6. Keep others, but inline them where possible and mark them as QT_DEPRECATED_SINCE(5, 0). Change-Id: If881821ae095f054b31cc13464f19e2007c20ed7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'src/corelib/tools/qregexp.cpp')
-rw-r--r--src/corelib/tools/qregexp.cpp7
1 files changed, 1 insertions, 6 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