From 62ccbb1d026b08ae70973e5b15adecd980556f0e Mon Sep 17 00:00:00 2001 From: Chris Djali Date: Fri, 28 Feb 2025 18:52:49 +0000 Subject: Write BOM if original file used one (#2213) Important for UTF-16 as lots of things can't detect or read UTF-16 without a BOM --- src/texteditor.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/texteditor.cpp') diff --git a/src/texteditor.cpp b/src/texteditor.cpp index 281a545d..e015dc91 100644 --- a/src/texteditor.cpp +++ b/src/texteditor.cpp @@ -65,6 +65,7 @@ void TextEditor::clear() m_filename.clear(); m_encoding.clear(); + m_needsBOM = false; setPlainText(""); dirty(false); document()->setModified(false); @@ -80,7 +81,7 @@ bool TextEditor::load(const QString& filename) m_filename = filename; - const QString s = MOBase::readFileText(filename, &m_encoding); + const QString s = MOBase::readFileText(filename, &m_encoding, &m_needsBOM); setPlainText(s); document()->setModified(false); @@ -106,10 +107,13 @@ bool TextEditor::save() file.open(QIODevice::WriteOnly); file.resize(0); - auto codec = QStringConverter::encodingForName(m_encoding.toLocal8Bit()); + auto codec = QStringConverter::encodingForName(m_encoding.toUtf8()); if (!codec.has_value()) return false; - QStringEncoder encoder(codec.value()); + QStringConverter::Flags flags = QStringEncoder::Flag::Default; + if (m_needsBOM) + flags |= QStringConverter::Flag::WriteBom; + QStringEncoder encoder(codec.value(), flags); QString data = toPlainText().replace("\n", "\r\n"); -- cgit v1.3.1