diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 12:42:36 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 16:14:21 +0200 |
| commit | babd3e252b87a3b9c91cd44189d4fcb5cd8ab270 (patch) | |
| tree | 64104a9f17bbf8e1a6e0a9f7d011c177240d7c35 /src/corelib/tools/qregexp.h | |
| parent | 26f6a93ca55715ebb55beb413be8d29f8180a072 (diff) | |
Revert "[SIC] Make non-const the QRegExp methods that modify the internals"
This reverts commit 75a0c7f9b52cde47f20fdc1b89e1264d60350848. The
source-incompatible change proved to be more trouble than it's
worth. Too much intrusion into the porting effort of applications for
no appreciable gain, especially considering that we have a replacement
class.
Change-Id: Ia99a2360390a2062a8ddb6e12c8f2099287a2704
Discussed-on: http://lists.qt-project.org/pipermail/development/2012-May/003562.html
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qregexp.h')
| -rw-r--r-- | src/corelib/tools/qregexp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 234bb624e4..0455e1603e 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -93,10 +93,10 @@ public: bool isMinimal() const; void setMinimal(bool minimal); - bool exactMatch(const QString &str); + bool exactMatch(const QString &str) const; - int indexIn(const QString &str, int offset = 0, CaretMode caretMode = CaretAtZero); - int lastIndexIn(const QString &str, int offset = -1, CaretMode caretMode = CaretAtZero); + int indexIn(const QString &str, int offset = 0, CaretMode caretMode = CaretAtZero) const; + int lastIndexIn(const QString &str, int offset = -1, CaretMode caretMode = CaretAtZero) const; int matchedLength() const; #ifndef QT_NO_REGEXP_CAPTURE int captureCount() const; |