diff options
| author | hjk <hjk@qt.io> | 2025-06-16 09:54:21 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2025-06-19 08:29:17 +0000 |
| commit | 1185fd075202f8d8cd41b39778aeecf4c67f7679 (patch) | |
| tree | 6bf51be233c0f4db8a392f37f75b46a0710cef6c /src/plugins/git/gitclient.cpp | |
| parent | e964f91d0bf840e11246a0b1fefc5478b62d5b0e (diff) | |
Utils: Progress towards using TextEncoding
Change-Id: I2aa56d4803980b4e43493542fbf2b103f77f16ab
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 6733aacdddd..2cb6a4547d1 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -979,7 +979,7 @@ TextEncoding GitClient::defaultCommitEncoding() const { // Set default commit encoding to 'UTF-8', when it's not set, // to solve displaying error of commit log with non-latin characters. - return QStringConverter::Utf8; + return TextEncoding::Utf8; } TextEncoding GitClient::encoding(GitClient::EncodingType encodingType, const FilePath &source) const @@ -2713,7 +2713,7 @@ Result<CommitData> GitClient::enrichCommitData(const FilePath &repoDirectory, CommitData commitData = commitDataIn; const TextEncoding authorEncoding = HostOsInfo::isWindowsHost() - ? QStringConverter::Utf8 + ? TextEncoding::Utf8 : commitData.commitEncoding; const TextCodec authorCodec = TextCodec::codecForName(authorEncoding); QByteArray stdOut = result.rawStdOut(); @@ -3572,7 +3572,7 @@ static TextEncoding configFileEncoding() // Git for Windows always uses UTF-8 for configuration: // https://github.com/msysgit/msysgit/wiki/Git-for-Windows-Unicode-Support#convert-config-files static const TextEncoding encoding = - HostOsInfo::isWindowsHost() ? QStringConverter::Utf8 : TextEncoding::encodingForLocale(); + HostOsInfo::isWindowsHost() ? TextEncoding::Utf8 : TextEncoding::encodingForLocale(); return encoding; } |