1 files changed, 7 insertions, 3 deletions
diff --git a/src/texteditor.cpp b/src/texteditor.cpp
index 4a8080f4..7f62a6ef 100644
--- a/src/texteditor.cpp
+++ b/src/texteditor.cpp
@@ -107,10 +107,14 @@ bool TextEditor::save()
   file.open(QIODevice::WriteOnly);
   file.resize(0);
 
-  QTextCodec* codec = QTextCodec::codecForName(m_encoding.toUtf8());
+  auto codec = QStringConverter::encodingForName(m_encoding.toLocal8Bit());
+  if (!codec.has_value())
+    return false;
+  QStringEncoder encoder(codec.value());
+
   QString data = toPlainText().replace("\n", "\r\n");
 
-  file.write(codec->fromUnicode(data));
+  file.write(encoder.encode(data));
   document()->setModified(false);
 
   return true;
@@ -284,7 +288,7 @@ void TextEditor::resizeEvent(QResizeEvent* e)
 void TextEditor::paintLineNumbers(QPaintEvent* e, const QColor& textColor)
 {
   QStyleOption opt;
-  opt.init(m_lineNumbers);
+  opt.initFrom(m_lineNumbers);
 
   QPainter painter(m_lineNumbers);