From 4484edd212d472b440691a0ad496dd9d0a922dc2 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Sat, 26 Nov 2022 05:59:35 +0400
Subject: [PATCH] Get rid of unneeded QTextStream from GenerateDesktopFile
---
.../platform/linux/specific_linux.cpp | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
index 36853f6df..d7afc33d3 100644
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@@ -422,13 +422,15 @@ bool GenerateDesktopFile(
const auto sourceFile = kDesktopFile.utf16();
const auto targetFile = targetPath + QGuiApplication::desktopFileName();
- QString fileText;
- QFile source(sourceFile);
- if (source.open(QIODevice::ReadOnly)) {
- QTextStream s(&source);
- fileText = s.readAll();
- source.close();
- } else {
+ const auto sourceText = [&] {
+ QFile source(sourceFile);
+ if (source.open(QIODevice::ReadOnly)) {
+ return source.readAll().toStdString();
+ }
+ return std::string();
+ }();
+
+ if (sourceText.empty()) {
if (!silent) {
LOG(("App Error: Could not open '%1' for read").arg(sourceFile));
}
@@ -438,7 +440,7 @@ bool GenerateDesktopFile(
try {
const auto target = Glib::KeyFile::create();
target->load_from_data(
- fileText.toStdString(),
+ sourceText,
Glib::KeyFile::Flags::KEEP_COMMENTS
| Glib::KeyFile::Flags::KEEP_TRANSLATIONS);