feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Replace an explicit use of TextCodec with QStringEncoder

Browse Source 
Change-Id: I9db29b6d7bfdffc13bf5fc8df6cf4b1f2924301d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
hjk
2025-06-16 10:47:21 +02:00
parent 812abd9717
commit d7bed16f91
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/vcsbase/vcsbaseeditor.cpp
View File

@@ -1222,9 +1222,15 @@ DiffChunk VcsBaseEditorWidget::diffChunk(QTextCursor cursor) const
unicode += QLatin1Char('\n'); unicode += QLatin1Char('\n');
} }
} }
const TextCodec cd = textDocument()->codec(); const TextEncoding encoding = textDocument()->encoding();
rc.chunk = cd.isValid() ? cd.fromUnicode(unicode) : unicode.toLocal8Bit(); if (encoding.isValid()) {
rc.header = cd.isValid() ? cd.fromUnicode(header) : header.toLocal8Bit(); QStringEncoder encoder(encoding);
rc.chunk = encoder.encode(unicode);
rc.header = encoder.encode(header);
} else {
rc.chunk = unicode.toLocal8Bit();
rc.header = header.toLocal8Bit();
}
return rc; return rc;
} }
@@ -1238,7 +1244,7 @@ static TextEncoding findFileCodec(const FilePath &source)
} }
// Find the codec by checking the projects (root dir of project file) // Find the codec by checking the projects (root dir of project file)
static TextEncoding findProjectCodec(const FilePath &dirPath) static TextEncoding findProjectEncoding(const FilePath &dirPath)
{ {
// Try to find a project under which file tree the file is. // Try to find a project under which file tree the file is.
const auto projects = ProjectExplorer::ProjectManager::projects(); const auto projects = ProjectExplorer::ProjectManager::projects();
@@ -1255,7 +1261,7 @@ TextEncoding VcsBaseEditor::getEncoding(const FilePath &source)
if (TextEncoding fc = findFileCodec(source); fc.isValid()) if (TextEncoding fc = findFileCodec(source); fc.isValid())
return fc; return fc;
// Find by project via directory // Find by project via directory
if (TextEncoding pc = findProjectCodec(source.isFile() ? source.absolutePath() : source); pc.isValid()) if (TextEncoding pc = findProjectEncoding(source.isFile() ? source.absolutePath() : source); pc.isValid())
return pc; return pc;
} }
return QStringConverter::System; return QStringConverter::System;