diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-07-18 08:56:51 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-07-24 07:10:35 +0000 |
| commit | 160ec0ada4d41c62c915092305b6e26df892a91b (patch) | |
| tree | aecf41a142fb8d994afe918734e7235e937b45b1 /examples/assistant/simpletextviewer/textedit.cpp | |
| parent | 1909f6d4ee9f259afeb10ac05dcdae26441a4b79 (diff) | |
SimpleTextViewer: Revamp the example
Fix const correctness.
Fix code formatting.
Fix error message on crash.
Use initializer lists in c'tors.
Limit the start assistant timeout to 3 seconds, like it's done for
termination.
Change-Id: Idfafa35834fba725b03d80e6252be8ac3eaf489f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit cbcd71aeac7c092c52de3d55f0f303d1cf4cab65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples/assistant/simpletextviewer/textedit.cpp')
| -rw-r--r-- | examples/assistant/simpletextviewer/textedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/assistant/simpletextviewer/textedit.cpp b/examples/assistant/simpletextviewer/textedit.cpp index 4a1f7159f..2f52f73a1 100644 --- a/examples/assistant/simpletextviewer/textedit.cpp +++ b/examples/assistant/simpletextviewer/textedit.cpp @@ -14,11 +14,11 @@ TextEdit::TextEdit(QWidget *parent) void TextEdit::setContents(const QString &fileName) { - QFileInfo fi(fileName); + const QFileInfo fi(fileName); srcUrl = QUrl::fromLocalFile(fi.absoluteFilePath()); QFile file(fileName); if (file.open(QIODevice::ReadOnly)) { - QString data(file.readAll()); + const QString data(QString::fromUtf8(file.readAll())); if (fileName.endsWith(".html")) setHtml(data); else |