diff options
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 35 |
1 files changed, 11 insertions, 24 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index bc39eafb6d..f48eaf5721 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6474,15 +6474,6 @@ QStringList QString::split(const QRegularExpression &re, SplitBehavior behavior) */ /*! - \fn QString QString::normalized(NormalizationForm mode) const - Returns the string in the given Unicode normalization \a mode. -*/ -QString QString::normalized(QString::NormalizationForm mode) const -{ - return normalized(mode, UNICODE_DATA_VERSION); -} - -/*! \since 4.5 Returns a copy of this string repeated the specified number of \a times. @@ -6531,21 +6522,6 @@ QString QString::repeated(int times) const return result; } -void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from); -/*! - \overload - \fn QString QString::normalized(NormalizationForm mode, QChar::UnicodeVersion version) const - - Returns the string in the given Unicode normalization \a mode, - according to the given \a version of the Unicode standard. -*/ -QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersion version) const -{ - QString copy = *this; - qt_string_normalize(©, mode, version, 0); - return copy; -} - void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar::UnicodeVersion version, int from) { bool simple = true; @@ -6606,6 +6582,17 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar:: composeHelper(data, version, from); } +/*! + Returns the string in the given Unicode normalization \a mode, + according to the given \a version of the Unicode standard. +*/ +QString QString::normalized(QString::NormalizationForm mode, QChar::UnicodeVersion version) const +{ + QString copy = *this; + qt_string_normalize(©, mode, version, 0); + return copy; +} + struct ArgEscapeData { |