diff options
5 files changed, 7 insertions, 20 deletions
diff --git a/examples/widgets/tools/codecs/mainwindow.cpp b/examples/widgets/tools/codecs/mainwindow.cpp index dc72fa73b7..dfd2ff452a 100644 --- a/examples/widgets/tools/codecs/mainwindow.cpp +++ b/examples/widgets/tools/codecs/mainwindow.cpp @@ -122,9 +122,9 @@ void MainWindow::save() return; } - QTextStream out(&file); - out.setCodec(codecName.constData()); - out << textEdit->toPlainText(); + QTextCodec *codec = QTextCodec::codecForName(codecName.constData()); + QByteArray text = codec->fromUnicode(textEdit->toPlainText()); + file.write(text); } void MainWindow::about() diff --git a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp index 849f0e957f..65f855f977 100644 --- a/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp @@ -154,10 +154,7 @@ bool MainWindow::writeXml(const QString &fileName) QFile file(fileName); if (file.open(QFile::WriteOnly)) { - QTextStream textStream(&file); - textStream.setCodec(QTextCodec::codecForName("UTF-8")); - - textStream << domDocument->toString(1).toUtf8(); + file.write(domDocument->toString(1).toUtf8()); file.close(); return true; } diff --git a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp index edfadb4c77..620f41708a 100644 --- a/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-frames/mainwindow.cpp @@ -159,10 +159,7 @@ bool MainWindow::writeXml(const QString &fileName) QFile file(fileName); if (file.open(QFile::WriteOnly)) { - QTextStream textStream(&file); - textStream.setCodec(QTextCodec::codecForName("UTF-8")); - - textStream << domDocument->toString(1).toUtf8(); + file.write(domDocument->toString(1).toUtf8()); file.close(); return true; } diff --git a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp index bd976a8ce4..85e7fc109a 100644 --- a/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp +++ b/src/gui/doc/snippets/textdocument-tables/mainwindow.cpp @@ -202,10 +202,7 @@ bool MainWindow::writeXml(const QString &fileName) QFile file(fileName); if (file.open(QFile::WriteOnly)) { - QTextStream textStream(&file); - textStream.setCodec(QTextCodec::codecForName("UTF-8")); - - textStream << domDocument->toString(1).toUtf8(); + file.write(domDocument->toString(1).toUtf8()); file.close(); return true; } diff --git a/src/gui/text/qtextdocumentwriter.cpp b/src/gui/text/qtextdocumentwriter.cpp index 4a57268486..31dfb9436f 100644 --- a/src/gui/text/qtextdocumentwriter.cpp +++ b/src/gui/text/qtextdocumentwriter.cpp @@ -286,11 +286,7 @@ bool QTextDocumentWriter::write(const QTextDocument *document) qWarning("QTextDocumentWriter::write: the device cannot be opened for writing"); return false; } - QTextStream ts(d->device); -#if QT_CONFIG(textcodec) - ts.setCodec("utf-8"); -#endif - ts << document->toPlainText(); + d->device->write(document->toPlainText().toUtf8()); d->device->close(); return true; } |