diff options
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 31 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.h | 7 |
2 files changed, 24 insertions, 14 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 37f8554381..c22c8a9edd 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -8788,6 +8788,14 @@ QVector<uint> QStringRef::toUcs4() const return v; } + +/*! + \obsolete + \fn QString Qt::escape(const QString &plain) + + \sa QString::toHtmlEscaped() +*/ + /*! Converts the plain text string \a plain to a HTML string with HTML metacharacters \c{<}, \c{>}, \c{&}, and \c{"} replaced by HTML @@ -8795,27 +8803,24 @@ QVector<uint> QStringRef::toUcs4() const Example: - \snippet doc/src/snippets/code/src_gui_text_qtextdocument.cpp 0 - - This function is defined in the \c <QString> header file. - - \sa convertFromPlainText(), mightBeRichText() + \snippet doc/src/snippets/code/src_corelib_tools_qstring.cpp 7 */ -QString Qt::escape(const QString &plain) +QString QString::toHtmlEscaped() const { QString rich; - rich.reserve(int(plain.length() * 1.1)); - for (int i = 0; i < plain.length(); ++i) { - if (plain.at(i) == QLatin1Char('<')) + const int len = length(); + rich.reserve(int(len * 1.1)); + for (int i = 0; i < len; ++i) { + if (at(i) == QLatin1Char('<')) rich += QLatin1String("<"); - else if (plain.at(i) == QLatin1Char('>')) + else if (at(i) == QLatin1Char('>')) rich += QLatin1String(">"); - else if (plain.at(i) == QLatin1Char('&')) + else if (at(i) == QLatin1Char('&')) rich += QLatin1String("&"); - else if (plain.at(i) == QLatin1Char('"')) + else if (at(i) == QLatin1Char('"')) rich += QLatin1String("""); else - rich += plain.at(i); + rich += at(i); } rich.squeeze(); return rich; 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 |