From 6932d859c90c4fe3506526770d4b7deb2e4d64cc Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 19 Feb 2021 08:27:58 +0400
Subject: [PATCH] Get rid of unneeded QT_VERSION_CHECK in linux platform code

---
 Telegram/SourceFiles/platform/linux/launcher_linux.cpp    | 3 ---
 .../platform/linux/notifications_manager_linux.cpp        | 4 ----
 Telegram/SourceFiles/platform/platform_window_title.h     | 8 +-------
 .../ThirdParty/statusnotifieritem/statusnotifieritem.cpp  | 7 +------
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
index 18840ea960..b2fe79b6b3 100644
--- a/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/launcher_linux.cpp
@@ -49,10 +49,7 @@ Launcher::Launcher(int argc, char *argv[])
 }
 
 void Launcher::initHook() {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
 	QApplication::setAttribute(Qt::AA_DisableSessionManager, true);
-#endif // Qt >= 5.14
-
 	QApplication::setDesktopFileName(GetLauncherFilename());
 }
 
diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
index eb7ca59e54..5d90b2e4f9 100644
--- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp
@@ -590,11 +590,7 @@ void NotificationData::setImage(const QString &imagePath) {
 		g_variant_new_from_data(
 			G_VARIANT_TYPE("ay"),
 			_image.constBits(),
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-			_image.byteCount(),
-#else // Qt < 5.10.0
 			_image.sizeInBytes(),
-#endif // Qt >= 5.10.0
 			true,
 			nullptr,
 			nullptr)));
diff --git a/Telegram/SourceFiles/platform/platform_window_title.h b/Telegram/SourceFiles/platform/platform_window_title.h
index cd6b3a631b..8c70e8fa16 100644
--- a/Telegram/SourceFiles/platform/platform_window_title.h
+++ b/Telegram/SourceFiles/platform/platform_window_title.h
@@ -36,17 +36,11 @@ void PreviewWindowFramePaint(QImage &preview, const style::palette &palette, QRe
 namespace Platform {
 
 inline bool AllowNativeWindowFrameToggle() {
-#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) || defined DESKTOP_APP_QT_PATCHED
 	return true;
-#else // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
-	return false;
-#endif // Qt >= 5.15 || DESKTOP_APP_QT_PATCHED
 }
 
 inline object_ptr<Window::TitleWidget> CreateTitleWidget(QWidget *parent) {
-	return AllowNativeWindowFrameToggle()
-		? object_ptr<Window::TitleWidgetQt>(parent)
-		: object_ptr<Window::TitleWidgetQt>{ nullptr };
+	return object_ptr<Window::TitleWidgetQt>(parent);
 }
 
 inline bool NativeTitleRequiresShadow() {
diff --git a/Telegram/ThirdParty/statusnotifieritem/statusnotifieritem.cpp b/Telegram/ThirdParty/statusnotifieritem/statusnotifieritem.cpp
index 38f0eea1cc..34ceb3c74e 100644
--- a/Telegram/ThirdParty/statusnotifieritem/statusnotifieritem.cpp
+++ b/Telegram/ThirdParty/statusnotifieritem/statusnotifieritem.cpp
@@ -333,12 +333,7 @@ IconPixmapList StatusNotifierItem::iconToPixmapList(const QIcon& icon)
         if (image.format() != QImage::Format_ARGB32)
             image = image.convertToFormat(QImage::Format_ARGB32);
 
-        pix.bytes = QByteArray((char *) image.bits(),
-#if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
-                               image.byteCount());
-#else
-                               image.sizeInBytes());
-#endif
+        pix.bytes = QByteArray((char *) image.bits(), image.sizeInBytes());
 
         // swap to network byte order if we are little endian
         if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)