mark qt_readEscapedFormatString() and qt_repeatCount() as static

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/tools/qlocale.cpp b/src/core/tools/qlocale.cpp
index a93b322..405fdd2 100644 (file)
--- a/src/core/tools/qlocale.cpp
+++ b/src/core/tools/qlocale.cpp
@@ -298,7 +298,7 @@ static const QLocalePrivate *findLocale(const QString &name)
     return QLocalePrivate::findLocale(lang, script, cntry);
 }
 
-QString qt_readEscapedFormatString(const QString &format, int *idx)
+static QString qt_readEscapedFormatString(const QString &format, int *idx)
 {
     int &i = *idx;
 
@@ -332,11 +332,10 @@ QString qt_readEscapedFormatString(const QString &format, int *idx)
     return result;
 }
 
-int qt_repeatCount(const QString &s, int i)
+static int qt_repeatCount(const QString &s, int i)
 {
-    QChar c = s.at(i);
     int j = i + 1;
-    while (j < s.size() && s.at(j) == c)
+    while (j < s.size() && s.at(j) == s.at(i))
         ++j;
     return j - i;
 }

diff --git a/src/core/tools/qlocale_p.h b/src/core/tools/qlocale_p.h
index f10e3f9..91b951a 100644 (file)
--- a/src/core/tools/qlocale_p.h
+++ b/src/core/tools/qlocale_p.h
@@ -244,10 +244,7 @@ inline char QLocalePrivate::digitToCLocale(const QChar &in) const
     return 0;
 }
 
-
-QString qt_readEscapedFormatString(const QString &format, int *idx);
 bool qt_splitLocaleName(const QString &name, QString &lang, QString &script, QString &cntry);
-int qt_repeatCount(const QString &s, int i);
 
 QT_END_NAMESPACE