diff options
| author | David Faure <faure@kde.org> | 2011-09-29 13:31:39 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 15:22:07 +0200 |
| commit | b863df7de926448cf0057272c16da04b7cfb11ee (patch) | |
| tree | 378b951c3ad748bcb6250d8d33d9be55494933e2 /src/corelib/tools/qstring.h | |
| parent | 7fb90066b3aa7e602466a61e0ffaadbf9002525c (diff) | |
Rename Qt::escape to QString::toHtmlEscaped, add compat method
Merge-request: 56
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Change-Id: I46bbb2df10968e88b5eb5ef8dae182a651b622b8
Reviewed-on: http://codereview.qt-project.org/5793
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.h')
| -rw-r--r-- | src/corelib/tools/qstring.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index adb7e06ce1..b73a34a2a0 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -330,6 +330,7 @@ public: QString trimmed() const Q_REQUIRED_RESULT; QString simplified() const Q_REQUIRED_RESULT; + QString toHtmlEscaped() const Q_REQUIRED_RESULT; QString &insert(int i, QChar c); QString &insert(int i, const QChar *uc, int len); @@ -1250,7 +1251,11 @@ inline QBool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) c { return QBool(indexOf(s, 0, cs) != -1); } namespace Qt { - Q_CORE_EXPORT QString escape(const QString &plain); +#if QT_DEPRECATED_SINCE(5, 0) +QT_DEPRECATED inline QString escape(const QString &plain) { + return plain.toHtmlEscaped(); +} +#endif } QT_END_NAMESPACE |