AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unite QString::normalized() overloads

Browse Source 
Change-Id: I27545e599a1831728e491a9fad1e52fa255535fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Konstantin Ritt 2012-04-05 02:29:35 +03:00 committed by Qt by Nokia
parent 7be255156f
commit f97db2555e
2 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/corelib/tools/qstring.cpp
View File

@ -6473,15 +6473,6 @@ QStringList QString::split(const QRegularExpression &re, SplitBehavior behavior)
{http://www.unicode.org/reports/tr15/}{Unicode Standard Annex #15}
*/
/*!
\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
@ -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(&copy, 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(&copy, mode, version, 0);
return copy;
}
struct ArgEscapeData
{

3
src/corelib/tools/qstring.h
View File

@ -425,8 +425,7 @@ public:
NormalizationForm_KD,
NormalizationForm_KC
};
QString normalized(NormalizationForm mode) const Q_REQUIRED_RESULT;
QString normalized(NormalizationForm mode, QChar::UnicodeVersion version) const Q_REQUIRED_RESULT;
QString normalized(NormalizationForm mode, QChar::UnicodeVersion version = QChar::Unicode_Unassigned) const Q_REQUIRED_RESULT;
QString repeated(int times) const;