summaryrefslogtreecommitdiffstats
path: root/src/corelib/text/qstring.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-04-29 15:56:24 +0200
committerLars Knoll <lars.knoll@qt.io>2020-05-14 07:50:29 +0200
commit124d587bb95f35c853ab3458bdeb1519d369cdf1 (patch)
tree54ec10e28aa7671ad3358b9ae9ecb01d18de3b83 /src/corelib/text/qstring.cpp
parent4ff09cdd47a1f21321a56017743401a7c6b91ad3 (diff)
Document the string converter classes
Document QStringConverter, QStringDecoder and QStringEncoder. In addition, do some touches to the API, renaming one enum value, add a flags argument to one constructor and make some members private. Change-Id: I8f99dc3d98fb8860cf6fa46301e34b7eb400511b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstring.cpp')
-rw-r--r--src/corelib/text/qstring.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 7753ce5f00..857aa601c1 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -5206,7 +5206,7 @@ static QByteArray qt_convert_to_local_8bit(QStringView string)
{
if (string.isNull())
return QByteArray();
- QStringEncoder fromUtf16(QStringEncoder::Locale, QStringEncoder::Flag::Stateless);
+ QStringEncoder fromUtf16(QStringEncoder::System, QStringEncoder::Flag::Stateless);
return fromUtf16(string);
}
@@ -5392,7 +5392,7 @@ QString QString::fromLocal8Bit_helper(const char *str, int size)
QString::DataPointer empty = { pair.first, pair.second, 0 };
return QString(empty);
}
- QStringDecoder toUtf16(QStringDecoder::Locale, QStringDecoder::Flag::Stateless);
+ QStringDecoder toUtf16(QStringDecoder::System, QStringDecoder::Flag::Stateless);
return toUtf16(str, size);
}