Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Write BOM if original file used one #2213

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Write BOM if original file used one #2213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/texteditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ void TextEditor::clear()

m_filename.clear();
m_encoding.clear();
m_needsBOM = false;
setPlainText("");
dirty(false);
document()->setModified(false);
Expand All @@ -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);
Expand All @@ -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");

Expand Down
1 change: 1 addition & 0 deletions src/texteditor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ class TextEditor : public QPlainTextEdit
QColor m_highlightBackground;
QString m_filename;
QString m_encoding;
bool m_needsBOM;
bool m_dirty;
bool m_loading;

Expand Down
Loading