From 4a732fb66776642cc3c87b54e12857f6d2b938ed Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 4 Jul 2023 17:57:23 +0300
Subject: [PATCH] plasma: remove redundant PlasmaApp::hasComposite() methods

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 plasma/shells/plasma-desktop/panelview.cpp  |  2 +-
 plasma/shells/plasma-desktop/plasmaapp.cpp  | 10 ----------
 plasma/shells/plasma-desktop/plasmaapp.h    |  1 -
 plasma/shells/plasma-windowed/plasmaapp.cpp |  6 ------
 plasma/shells/plasma-windowed/plasmaapp.h   |  2 --
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/plasma/shells/plasma-desktop/panelview.cpp b/plasma/shells/plasma-desktop/panelview.cpp
index ae2213f0..abc24fda 100644
--- a/plasma/shells/plasma-desktop/panelview.cpp
+++ b/plasma/shells/plasma-desktop/panelview.cpp
@@ -1463,7 +1463,7 @@ void PanelView::appletAdded(Plasma::Applet *applet)
 
 bool PanelView::shouldHintHide() const
 {
-    return m_visibilityMode == AutoHide && PlasmaApp::hasComposite();
+    return m_visibilityMode == AutoHide && KWindowSystem::compositingActive();
 }
 
 void PanelView::recreateUnhideTrigger()
diff --git a/plasma/shells/plasma-desktop/plasmaapp.cpp b/plasma/shells/plasma-desktop/plasmaapp.cpp
index 5560326d..1af14f9f 100644
--- a/plasma/shells/plasma-desktop/plasmaapp.cpp
+++ b/plasma/shells/plasma-desktop/plasmaapp.cpp
@@ -626,16 +626,6 @@ void PlasmaApp::wallpaperCheckedIn()
     }
 }
 
-bool PlasmaApp::hasComposite()
-{
-//    return true;
-#ifdef Q_WS_X11
-    return KWindowSystem::compositingActive();
-#else
-    return false;
-#endif
-}
-
 void PlasmaApp::suspendStartup(bool suspend)
 {
     org::kde::KSMServerInterface ksmserver("org.kde.ksmserver", "/KSMServer", QDBusConnection::sessionBus());
diff --git a/plasma/shells/plasma-desktop/plasmaapp.h b/plasma/shells/plasma-desktop/plasmaapp.h
index 09c26718..b8783c53 100644
--- a/plasma/shells/plasma-desktop/plasmaapp.h
+++ b/plasma/shells/plasma-desktop/plasmaapp.h
@@ -59,7 +59,6 @@ public:
     ~PlasmaApp();
 
     static PlasmaApp *self();
-    static bool hasComposite();
 
     void suspendStartup(bool completed);
     DesktopCorona *corona(bool createIfMissing = true);
diff --git a/plasma/shells/plasma-windowed/plasmaapp.cpp b/plasma/shells/plasma-windowed/plasmaapp.cpp
index d8650742..c10ed254 100644
--- a/plasma/shells/plasma-windowed/plasmaapp.cpp
+++ b/plasma/shells/plasma-windowed/plasmaapp.cpp
@@ -217,12 +217,6 @@ Plasma::Corona* PlasmaApp::corona()
     return m_corona;
 }
 
-bool PlasmaApp::hasComposite()
-{
-    return KWindowSystem::compositingActive();
-}
-
-
 void PlasmaApp::storeApplet(Plasma::Applet *applet)
 {
     m_storedApplets.insert(applet->name(), applet->id());
diff --git a/plasma/shells/plasma-windowed/plasmaapp.h b/plasma/shells/plasma-windowed/plasmaapp.h
index 057d303e..fe43a910 100644
--- a/plasma/shells/plasma-windowed/plasmaapp.h
+++ b/plasma/shells/plasma-windowed/plasmaapp.h
@@ -52,11 +52,9 @@ public:
     int newInstance();
 
     static PlasmaApp* self();
-    static bool hasComposite();
 
     Plasma::Corona* corona();
 
-
 private:
     PlasmaApp();