diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-22 16:32:10 +0100 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-24 10:30:12 +0100 |
| commit | 52dc52dffb80f3ffd321156639564b524263810a (patch) | |
| tree | 18d8492db644efce075ff10afdcfe5c5f20305e2 /src/corelib/tools/qlocale_win.cpp | |
| parent | 18d9987e4a8f096ac4e4045ebc1a35d93e8fc134 (diff) | |
| download | qt4-tools-52dc52dffb80f3ffd321156639564b524263810a.tar.gz | |
QLocale fixes.
Prepended non-static functions with a qt_ prefix as our policy says.
Reviewed-by: trustme
Diffstat (limited to 'src/corelib/tools/qlocale_win.cpp')
| -rw-r--r-- | src/corelib/tools/qlocale_win.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index c892e04ac2..0c2d039dd1 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -573,7 +573,7 @@ QString QSystemLocalePrivate::winToQtFormat(const QString &sys_fmt) while (i < sys_fmt.size()) { if (sys_fmt.at(i).unicode() == QLatin1Char('\'')) { - QString text = readEscapedFormatString(sys_fmt, &i); + QString text = qt_readEscapedFormatString(sys_fmt, &i); if (text == QLatin1String("'")) result += QLatin1String("''"); else @@ -582,7 +582,7 @@ QString QSystemLocalePrivate::winToQtFormat(const QString &sys_fmt) } QChar c = sys_fmt.at(i); - int repeat = repeatCount(sys_fmt, i); + int repeat = qt_repeatCount(sys_fmt, i); switch (c.unicode()) { // Date @@ -925,7 +925,7 @@ static QByteArray getWinLocaleName(LCID id) result = langEnvVar; QString lang, script, cntry; if ( result == "C" || (!result.isEmpty() - && splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) ) { + && qt_splitLocaleName(QString::fromLocal8Bit(result), lang, script, cntry)) ) { long id = 0; bool ok = false; id = qstrtoll(result.data(), 0, 0, &ok); |