unite QString::normalized() overloads

Change-Id: I27545e599a1831728e491a9fad1e52fa255535fc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index bc39eaf..f48eaf5 100644 (file)
--- 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(&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
 {

diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 4936bce..a9f2484 100644 (file)
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -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;