From 23c8d7f38f682d8ce30f616649d7605fe96979f5 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 22 Feb 2021 08:10:58 +0400 Subject: [PATCH] Remove unneeded checks for GtkIntegration::loaded() Due to rearranged loading of gtk methods --- .../platform/linux/linux_gtk_integration.cpp | 12 +++--------- .../platform/linux/linux_gtk_integration.h | 1 - .../platform/linux/linux_gtk_integration_dummy.cpp | 4 ---- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp index ae178a81b..394a2fbb0 100644 --- a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.cpp @@ -22,8 +22,6 @@ using BaseGtkIntegration = base::Platform::GtkIntegration; namespace { -bool Loaded = false; - QLibrary &Library() { return BaseGtkIntegration::Instance()->library(); } @@ -57,7 +55,8 @@ GtkIntegration *GtkIntegration::Instance() { } void GtkIntegration::load() { - Expects(!loaded()); + static bool Loaded = false; + Expects(!Loaded); if (!BaseGtkIntegration::Instance()->loaded()) { return; @@ -134,13 +133,8 @@ void GtkIntegration::load() { Loaded = true; } -bool GtkIntegration::loaded() const { - return Loaded; -} - std::optional GtkIntegration::scaleFactor() const { - if (!loaded() - || (gdk_display_get_default == nullptr) + if ((gdk_display_get_default == nullptr) || (gdk_display_get_monitor == nullptr) || (gdk_display_get_primary_monitor == nullptr) || (gdk_monitor_get_scale_factor == nullptr)) { diff --git a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.h b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.h index 4a24bd388..ffd242c31 100644 --- a/Telegram/SourceFiles/platform/linux/linux_gtk_integration.h +++ b/Telegram/SourceFiles/platform/linux/linux_gtk_integration.h @@ -17,7 +17,6 @@ public: static GtkIntegration *Instance(); void load(); - [[nodiscard]] bool loaded() const; [[nodiscard]] std::optional scaleFactor() const; diff --git a/Telegram/SourceFiles/platform/linux/linux_gtk_integration_dummy.cpp b/Telegram/SourceFiles/platform/linux/linux_gtk_integration_dummy.cpp index e27184daa..ac83bf3be 100644 --- a/Telegram/SourceFiles/platform/linux/linux_gtk_integration_dummy.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_gtk_integration_dummy.cpp @@ -20,10 +20,6 @@ GtkIntegration *GtkIntegration::Instance() { void GtkIntegration::load() { } -bool GtkIntegration::loaded() const { - return false; -} - std::optional GtkIntegration::scaleFactor() const { return std::nullopt; }