From 4fde7852b164b6554a8366df8b5cc8f73fe1ba97 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 19 Feb 2021 09:16:17 +0400 Subject: [PATCH] Use qEnvironmentVariable where appropriate --- Telegram/SourceFiles/core/sandbox.cpp | 8 ++++---- .../platform/linux/linux_desktop_environment.cpp | 3 +-- Telegram/SourceFiles/platform/linux/specific_linux.cpp | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp index bbf608b4f..0ac205e2e 100644 --- a/Telegram/SourceFiles/core/sandbox.cpp +++ b/Telegram/SourceFiles/core/sandbox.cpp @@ -203,10 +203,10 @@ void Sandbox::setupScreenScale() { if (ratio > 1.) { if (!Platform::IsMac() || (ratio != 2.)) { LOG(("Found non-trivial Device Pixel Ratio: %1").arg(ratio)); - LOG(("Environmental variables: QT_DEVICE_PIXEL_RATIO='%1'").arg(QString::fromLatin1(qgetenv("QT_DEVICE_PIXEL_RATIO")))); - LOG(("Environmental variables: QT_SCALE_FACTOR='%1'").arg(QString::fromLatin1(qgetenv("QT_SCALE_FACTOR")))); - LOG(("Environmental variables: QT_AUTO_SCREEN_SCALE_FACTOR='%1'").arg(QString::fromLatin1(qgetenv("QT_AUTO_SCREEN_SCALE_FACTOR")))); - LOG(("Environmental variables: QT_SCREEN_SCALE_FACTORS='%1'").arg(QString::fromLatin1(qgetenv("QT_SCREEN_SCALE_FACTORS")))); + LOG(("Environmental variables: QT_DEVICE_PIXEL_RATIO='%1'").arg(qEnvironmentVariable("QT_DEVICE_PIXEL_RATIO"))); + LOG(("Environmental variables: QT_SCALE_FACTOR='%1'").arg(qEnvironmentVariable("QT_SCALE_FACTOR"))); + LOG(("Environmental variables: QT_AUTO_SCREEN_SCALE_FACTOR='%1'").arg(qEnvironmentVariable("QT_AUTO_SCREEN_SCALE_FACTOR"))); + LOG(("Environmental variables: QT_SCREEN_SCALE_FACTORS='%1'").arg(qEnvironmentVariable("QT_SCREEN_SCALE_FACTORS"))); } style::SetDevicePixelRatio(int(ratio)); cSetScreenScale(style::kScaleDefault); diff --git a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp index bc9ce7293..1915224c5 100644 --- a/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_desktop_environment.cpp @@ -14,8 +14,7 @@ namespace DesktopEnvironment { namespace { QString GetEnv(const char *name) { - auto result = getenv(name); - auto value = result ? QString::fromLatin1(result) : QString(); + auto value = qEnvironmentVariable(name); LOG(("Getting DE, %1: '%2'").arg(name).arg(value)); return value; } diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index b5e4d41a6..bb26a1bf0 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -253,7 +253,7 @@ QString EscapeShellInLauncher(const QString &content) { QString FlatpakID() { static const auto Result = [] { if (!qEnvironmentVariableIsEmpty("FLATPAK_ID")) { - return QString::fromLatin1(qgetenv("FLATPAK_ID")); + return qEnvironmentVariable("FLATPAK_ID"); } else { return GetLauncherBasename(); }