From ad9087f180766340cb600e7e49f30c92a4c4642a Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sun, 31 Mar 2024 11:24:56 +0300
Subject: [PATCH] remove redundant check in QApplication::style()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 src/gui/kernel/qapplication.cpp | 38 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 3dcd82a0f..54b474579 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -832,26 +832,24 @@ QStyle *QApplication::style()
         return 0;
     }
 
-    if (!QApplicationPrivate::app_style) {
-        QString style;
-        if (!QApplicationPrivate::styleOverride.isEmpty()) {
-            style = QApplicationPrivate::styleOverride;
-        } else {
-            style = QApplicationPrivate::desktopStyleKey();
-        }
+    QString style;
+    if (!QApplicationPrivate::styleOverride.isEmpty()) {
+        style = QApplicationPrivate::styleOverride;
+    } else {
+        style = QApplicationPrivate::desktopStyleKey();
+    }
 
-        QApplicationPrivate::app_style = QStyleFactory::create(style);
-        if (!QApplicationPrivate::app_style) {
-            foreach (const QString &style, QStyleFactory::keys()) {
-                if ((QApplicationPrivate::app_style = QStyleFactory::create(style)))
-                    break;
-            }
-        }
-        if (!QApplicationPrivate::app_style) {
-            Q_ASSERT(!"No styles available!");
-            return 0;
+    QApplicationPrivate::app_style = QStyleFactory::create(style);
+    if (!QApplicationPrivate::app_style) {
+        foreach (const QString &style, QStyleFactory::keys()) {
+            if ((QApplicationPrivate::app_style = QStyleFactory::create(style)))
+                break;
         }
     }
+    if (!QApplicationPrivate::app_style) {
+        Q_ASSERT(!"No styles available!");
+        return nullptr;
+    }
     // take ownership of the style
     QApplicationPrivate::app_style->setParent(qApp);
 
@@ -984,9 +982,9 @@ void QApplication::setStyle(QStyle *style)
 QStyle* QApplication::setStyle(const QString& style)
 {
     QStyle *s = QStyleFactory::create(style);
-    if (!s)
-        return 0;
-
+    if (!s) {
+        return nullptr;
+    }
     setStyle(s);
     return s;
 }